aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/task_source/user_interaction.rs
diff options
context:
space:
mode:
authorddh <dianehosfelt@gmail.com>2017-10-24 02:45:55 +0100
committerddh <dianehosfelt@gmail.com>2017-10-25 14:25:58 +0100
commit52b63def44b4819184d2badcc4d123b770a7878a (patch)
treee027a7ad1ab55ab27b71005f0472a38469998267 /components/script/task_source/user_interaction.rs
parent2ffbe5398970e54ad55d3e53b495ee6651b64f4c (diff)
downloadservo-52b63def44b4819184d2badcc4d123b770a7878a.tar.gz
servo-52b63def44b4819184d2badcc4d123b770a7878a.zip
added pipelines to all task sources
changed task sources to accept pipeline ids
Diffstat (limited to 'components/script/task_source/user_interaction.rs')
-rw-r--r--components/script/task_source/user_interaction.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs
index ba90a26a080..12f822afedd 100644
--- a/components/script/task_source/user_interaction.rs
+++ b/components/script/task_source/user_interaction.rs
@@ -7,6 +7,7 @@ use dom::bindings::refcounted::Trusted;
use dom::event::{EventBubbles, EventCancelable, EventTask};
use dom::eventtarget::EventTarget;
use dom::window::Window;
+use msg::constellation_msg::PipelineId;
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
use script_thread::MainThreadScriptMsg;
use servo_atoms::Atom;
@@ -17,7 +18,7 @@ use task::{TaskCanceller, TaskOnce};
use task_source::TaskSource;
#[derive(Clone, JSTraceable)]
-pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>);
+pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>, pub PipelineId);
impl fmt::Debug for UserInteractionTaskSource {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -37,7 +38,7 @@ impl TaskSource for UserInteractionTaskSource {
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
ScriptThreadEventCategory::InputEvent,
Box::new(canceller.wrap_task(task)),
- None
+ Some(self.1)
));
self.0.send(msg).map_err(|_| ())
}