use remote-event task source in EventSource

2 files changed, 39 insertions, 1 deletions

diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs
index cf605976b46..23fb3e9ca8f 100644
--- a/components/script/task_source/mod.rs
+++ b/components/script/task_source/mod.rs
@@ -8,6 +8,7 @@ pub mod file_reading;
 pub mod history_traversal;
 pub mod networking;
 pub mod performance_timeline;
+pub mod remote_event;
 pub mod user_interaction;
 
 use dom::globalscope::GlobalScope;
@@ -26,7 +27,8 @@ pub enum TaskSourceName {
     HistoryTraversal,
     Networking,
     PerformanceTimeline,
-    UserInteraction
+    UserInteraction,
+    RemoteEvent
 }
 
 impl TaskSourceName {
diff --git a/components/script/task_source/remote_event.rs b/components/script/task_source/remote_event.rs
new file mode 100644
index 00000000000..2d8428cddbf
--- /dev/null
+++ b/components/script/task_source/remote_event.rs
@@ -0,0 +1,36 @@
+/* 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 http://mozilla.org/MPL/2.0/. */
+
+use msg::constellation_msg::PipelineId;
+use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
+use task::{TaskCanceller, TaskOnce};
+use task_source::{TaskSource, TaskSourceName};
+
+#[derive(JSTraceable)]
+pub struct RemoteEventTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId);
+
+impl Clone for RemoteEventTaskSource {
+    fn clone(&self) -> RemoteEventTaskSource {
+        RemoteEventTaskSource(self.0.clone(), self.1.clone())
+    }
+}
+
+impl TaskSource for RemoteEventTaskSource {
+    const NAME: TaskSourceName = TaskSourceName::RemoteEvent;
+
+    fn queue_with_canceller<T>(
+        &self,
+        task: T,
+        canceller: &TaskCanceller,
+    ) -> Result<(), ()>
+    where
+        T: TaskOnce + 'static,
+    {
+        self.0.send(CommonScriptMsg::Task(
+            ScriptThreadEventCategory::NetworkEvent,
+            Box::new(canceller.wrap_task(task)),
+            Some(self.1),
+        ))
+    }
+}