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/subtlecrypto.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/subtlecrypto.rs')
-rw-r--r-- | components/script/dom/subtlecrypto.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/subtlecrypto.rs b/components/script/dom/subtlecrypto.rs index df679b72621..344643ef3ce 100644 --- a/components/script/dom/subtlecrypto.rs +++ b/components/script/dom/subtlecrypto.rs @@ -54,7 +54,6 @@ use crate::dom::workerglobalscope::WorkerGlobalScope; use crate::realms::InRealm; use crate::script_runtime::{CanGc, JSContext}; use crate::task::TaskCanceller; -use crate::task_source::dom_manipulation::DOMManipulationTaskSource; use crate::task_source::TaskSource; // String constants for algorithms/curves @@ -142,13 +141,13 @@ impl SubtleCrypto { ) } - fn task_source_with_canceller(&self) -> (DOMManipulationTaskSource, TaskCanceller) { + fn task_source_with_canceller(&self) -> (TaskSource, TaskCanceller) { if let Some(window) = self.global().downcast::<Window>() { window .task_manager() .dom_manipulation_task_source_with_canceller() } else if let Some(worker_global) = self.global().downcast::<WorkerGlobalScope>() { - let task_source = worker_global.dom_manipulation_task_source(); + let task_source = worker_global.task_manager().dom_manipulation_task_source(); let canceller = worker_global.task_canceller(); (task_source, canceller) } else { |