diff options
author | Martin Robinson <mrobinson@igalia.com> | 2025-01-01 14:50:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-01 13:50:52 +0000 |
commit | 77cfca65c441ff1f8b54a507c9802e7ae6893e62 (patch) | |
tree | a7d141eb43f22a94ba6f4a548e0346e9358d49c5 /components/script/dom/eventsource.rs | |
parent | deb819f23368ed43b9312a439e48f9d5f961930c (diff) | |
download | servo-77cfca65c441ff1f8b54a507c9802e7ae6893e62.tar.gz servo-77cfca65c441ff1f8b54a507c9802e7ae6893e62.zip |
script: Eliminate code duplication in the task queue (#34798)
Instead of creating a type for each `TaskSource` variety have each `TaskSource`
hold the same kind of sender (this was inconsistent before, but each
sender was effectively the same trait object), a pipeline, and a
`TaskSourceName`. This elminates the need to reimplement the same
queuing code for every task source.
In addition, have workers hold their own `TaskManager`. This allows just
exposing the manager on the `GlobalScope`. Currently the `TaskCanceller`
is different, but this will also be eliminated in a followup change.
This is a the first step toward having a shared set of `Sender`s on
`GlobalScope`.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script/dom/eventsource.rs')
-rw-r--r-- | components/script/dom/eventsource.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 504968931db..a64c5be8088 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -45,7 +45,7 @@ use crate::fetch::{create_a_potential_cors_request, FetchCanceller}; use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener}; use crate::realms::enter_realm; use crate::script_runtime::CanGc; -use crate::task_source::{TaskSource, TaskSourceName}; +use crate::task_source::TaskSourceName; use crate::timers::OneshotTimerCallback; const DEFAULT_RECONNECTION_TIME: Duration = Duration::from_millis(5000); @@ -113,7 +113,7 @@ impl EventSourceContext { let global = event_source.global(); let event_source = self.event_source.clone(); // FIXME(nox): Why are errors silenced here? - let _ = global.remote_event_task_source().queue( + let _ = global.task_manager().remote_event_task_source().queue( task!(announce_the_event_source_connection: move || { let event_source = event_source.root(); if event_source.ready_state.get() != ReadyState::Closed { @@ -146,7 +146,7 @@ impl EventSourceContext { let action_sender = self.action_sender.clone(); let global = event_source.global(); // FIXME(nox): Why are errors silenced here? - let _ = global.remote_event_task_source().queue( + let _ = global.task_manager().remote_event_task_source().queue( task!(reestablish_the_event_source_onnection: move || { let event_source = trusted_event_source.root(); @@ -259,7 +259,7 @@ impl EventSourceContext { let event_source = self.event_source.clone(); let event = Trusted::new(&*event); // FIXME(nox): Why are errors silenced here? - let _ = global.remote_event_task_source().queue( + let _ = global.task_manager().remote_event_task_source().queue( task!(dispatch_the_event_source_event: move || { let event_source = event_source.root(); if event_source.ready_state.get() != ReadyState::Closed { @@ -500,7 +500,7 @@ impl EventSource { let global = self.global(); let event_source = Trusted::new(self); // FIXME(nox): Why are errors silenced here? - let _ = global.remote_event_task_source().queue( + let _ = global.task_manager().remote_event_task_source().queue( task!(fail_the_event_source_connection: move || { let event_source = event_source.root(); if event_source.ready_state.get() != ReadyState::Closed { @@ -605,7 +605,7 @@ impl EventSourceMethods<crate::DomTypeHolder> for EventSource { }; let listener = NetworkListener { context: Arc::new(Mutex::new(context)), - task_source: global.networking_task_source(), + task_source: global.task_manager().networking_task_source(), canceller: Some(global.task_canceller(TaskSourceName::Networking)), }; ROUTER.add_typed_route( |