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>

1 files changed, 0 insertions, 61 deletions

diff --git a/components/script/task_source/rendering.rs b/components/script/task_source/rendering.rs
deleted file mode 100644
index d6d0b2a5018..00000000000
--- a/components/script/task_source/rendering.rs
+++ /dev/null
@@ -1,61 +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 crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
-use crate::task::{TaskCanceller, TaskOnce};
-use crate::task_source::{TaskSource, TaskSourceName};
-
-#[derive(JSTraceable)]
-pub struct RenderingTaskSource(pub Box<dyn ScriptChan + Send>, #[no_trace] pub PipelineId);
-
-impl Clone for RenderingTaskSource {
-    fn clone(&self) -> RenderingTaskSource {
-        RenderingTaskSource(self.0.as_boxed(), self.1)
-    }
-}
-
-impl fmt::Debug for RenderingTaskSource {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RenderingTaskSource(...)")
-    }
-}
-
-impl TaskSource for RenderingTaskSource {
-    const NAME: TaskSourceName = TaskSourceName::Rendering;
-
-    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),
-            RenderingTaskSource::NAME,
-        );
-
-        self.0.send(msg_task).map_err(|_| ())
-    }
-}
-
-impl RenderingTaskSource {
-    /// This queues a task that will not be cancelled when its associated
-    /// global scope gets destroyed.
-    pub fn queue_unconditionally<T>(&self, task: T) -> Result<(), ()>
-    where
-        T: TaskOnce + 'static,
-    {
-        self.0.send(CommonScriptMsg::Task(
-            ScriptThreadEventCategory::NetworkEvent,
-            Box::new(task),
-            Some(self.1),
-            RenderingTaskSource::NAME,
-        ))
-    }
-}