From 12a96f71945dbd27336469f69f8e679a2b54b40b Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 25 Apr 2016 19:46:21 -0400
Subject: Rename DOM manipulation messages to tasks

---
 components/script/script_thread.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'components/script/script_thread.rs')

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index a46c1a28b18..5891bd35c7c 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -932,8 +932,8 @@ impl ScriptThread {
                 LiveDOMReferences::cleanup(addr),
             MainThreadScriptMsg::Common(CommonScriptMsg::CollectReports(reports_chan)) =>
                 self.collect_reports(reports_chan),
-            MainThreadScriptMsg::DOMManipulation(msg) =>
-                msg.handle_msg(self),
+            MainThreadScriptMsg::DOMManipulation(task) =>
+                task.handle_task(self),
         }
     }
 
-- 
cgit v1.2.3


From cc049515dc77d8975351d04074310874c486c512 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Sat, 12 Mar 2016 17:58:52 -0500
Subject: Implement user interaction task source

---
 components/script/script_thread.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'components/script/script_thread.rs')

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 5891bd35c7c..d615a937fcf 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -100,7 +100,7 @@ use task_source::dom_manipulation::{DOMManipulationTaskSource, DOMManipulationTa
 use task_source::file_reading::FileReadingTaskSource;
 use task_source::history_traversal::HistoryTraversalTaskSource;
 use task_source::networking::NetworkingTaskSource;
-use task_source::user_interaction::UserInteractionTaskSource;
+use task_source::user_interaction::{UserInteractionTaskSource, UserInteractionTask};
 use time::Tm;
 use url::{Url, Position};
 use util::opts;
@@ -222,6 +222,8 @@ pub enum MainThreadScriptMsg {
     Navigate(PipelineId, LoadData),
     /// Tasks that originate from the DOM manipulation task source
     DOMManipulation(DOMManipulationTask),
+    /// Tasks that originate from the user interaction task source
+    UserInteraction(UserInteractionTask),
 }
 
 impl OpaqueSender<CommonScriptMsg> for Box<ScriptChan + Send> {
@@ -934,6 +936,8 @@ impl ScriptThread {
                 self.collect_reports(reports_chan),
             MainThreadScriptMsg::DOMManipulation(task) =>
                 task.handle_task(self),
+            MainThreadScriptMsg::UserInteraction(task) =>
+                task.handle_task(),
         }
     }
 
-- 
cgit v1.2.3