aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/task_source/dom_manipulation.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2025-01-01 14:50:52 +0100
committerGitHub <noreply@github.com>2025-01-01 13:50:52 +0000
commit77cfca65c441ff1f8b54a507c9802e7ae6893e62 (patch)
treea7d141eb43f22a94ba6f4a548e0346e9358d49c5 /components/script/task_source/dom_manipulation.rs
parentdeb819f23368ed43b9312a439e48f9d5f961930c (diff)
downloadservo-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/task_source/dom_manipulation.rs')
-rw-r--r--components/script/task_source/dom_manipulation.rs76
1 files changed, 0 insertions, 76 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs
deleted file mode 100644
index c7800c76239..00000000000
--- a/components/script/task_source/dom_manipulation.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use std::fmt;
-use std::result::Result;
-
-use base::id::PipelineId;
-use servo_atoms::Atom;
-
-use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::refcounted::Trusted;
-use crate::dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask};
-use crate::dom::eventtarget::EventTarget;
-use crate::dom::window::Window;
-use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
-use crate::task::{TaskCanceller, TaskOnce};
-use crate::task_source::{TaskSource, TaskSourceName};
-
-#[derive(JSTraceable)]
-pub struct DOMManipulationTaskSource(pub Box<dyn ScriptChan + Send>, #[no_trace] pub PipelineId);
-
-impl Clone for DOMManipulationTaskSource {
- fn clone(&self) -> DOMManipulationTaskSource {
- DOMManipulationTaskSource(self.0.as_boxed(), self.1)
- }
-}
-
-impl fmt::Debug for DOMManipulationTaskSource {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- write!(f, "DOMManipulationTaskSource(...)")
- }
-}
-
-impl TaskSource for DOMManipulationTaskSource {
- const NAME: TaskSourceName = TaskSourceName::DOMManipulation;
-
- fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()>
- where
- T: TaskOnce + 'static,
- {
- let msg_task = CommonScriptMsg::Task(
- ScriptThreadEventCategory::ScriptEvent,
- Box::new(canceller.wrap_task(task)),
- Some(self.1),
- DOMManipulationTaskSource::NAME,
- );
-
- self.0.send(msg_task).map_err(|_| ())
- }
-}
-
-impl DOMManipulationTaskSource {
- pub fn queue_event(
- &self,
- target: &EventTarget,
- name: Atom,
- bubbles: EventBubbles,
- cancelable: EventCancelable,
- window: &Window,
- ) {
- let target = Trusted::new(target);
- let task = EventTask {
- target,
- name,
- bubbles,
- cancelable,
- };
- let _ = self.queue(task, window.upcast());
- }
-
- pub fn queue_simple_event(&self, target: &EventTarget, name: Atom, window: &Window) {
- let target = Trusted::new(target);
- let _ = self.queue(SimpleEventTask { target, name }, window.upcast());
- }
-}