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/task_source/user_interaction.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/task_source/user_interaction.rs')
-rw-r--r-- | components/script/task_source/user_interaction.rs | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs deleted file mode 100644 index 19ed025fc9a..00000000000 --- a/components/script/task_source/user_interaction.rs +++ /dev/null @@ -1,69 +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 crossbeam_channel::Sender; -use servo_atoms::Atom; - -use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::refcounted::Trusted; -use crate::dom::event::{EventBubbles, EventCancelable, EventTask}; -use crate::dom::eventtarget::EventTarget; -use crate::dom::window::Window; -use crate::messaging::MainThreadScriptMsg; -use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; -use crate::task::{TaskCanceller, TaskOnce}; -use crate::task_source::{TaskSource, TaskSourceName}; - -#[derive(Clone, JSTraceable)] -pub struct UserInteractionTaskSource( - #[no_trace] pub Sender<MainThreadScriptMsg>, - #[no_trace] pub PipelineId, -); - -impl fmt::Debug for UserInteractionTaskSource { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "UserInteractionTaskSource(...)") - } -} - -impl TaskSource for UserInteractionTaskSource { - const NAME: TaskSourceName = TaskSourceName::UserInteraction; - - fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()> - where - T: TaskOnce + 'static, - { - let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task( - ScriptThreadEventCategory::InputEvent, - Box::new(canceller.wrap_task(task)), - Some(self.1), - UserInteractionTaskSource::NAME, - )); - self.0.send(msg).map_err(|_| ()) - } -} - -impl UserInteractionTaskSource { - 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()); - } -} |