Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Kill UserInteractionTask

Browse source 
Just use a bare Runnable value.
This commit is contained in:
Anthony Ramine 2017-09-08 10:03:35 +02:00
parent 9252f2b8a2
commit 35a7252254
2 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/task_source/user_interaction.rs
View file

@ -7,7 +7,8 @@ use dom::bindings::refcounted::Trusted;
use dom::event::{EventBubbles, EventCancelable, EventRunnable};
use dom::eventtarget::EventTarget;
use dom::window::Window;
use script_thread::{MainThreadScriptMsg, Runnable, RunnableWrapper, ScriptThread};
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
use script_thread::{MainThreadScriptMsg, Runnable, RunnableWrapper};
use servo_atoms::Atom;
use std::fmt;
use std::result::Result;
@ -29,8 +30,11 @@ impl TaskSource for UserInteractionTaskSource {
wrapper: &RunnableWrapper)
-> Result<(), ()>
where T: Runnable + Send + 'static {
let msg = UserInteractionTask(wrapper.wrap_runnable(msg));
self.0.send(MainThreadScriptMsg::UserInteraction(msg)).map_err(|_| ())
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::RunnableMsg(
ScriptThreadEventCategory::InputEvent,
wrapper.wrap_runnable(msg),
));
self.0.send(msg).map_err(|_| ())
}
}
@ -51,17 +55,3 @@ impl UserInteractionTaskSource {
let _ = self.queue(runnable, window.upcast());
}
}
pub struct UserInteractionTask(pub Box<Runnable + Send>);
impl fmt::Debug for UserInteractionTask {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "UserInteractionTask(...)")
}
}
impl UserInteractionTask {
pub fn handle_task(self, script_thread: &ScriptThread) {
self.0.main_thread_handler(script_thread);
}
}