Add event runnables

Make tasks a wrapper over runnables
This commit is contained in:
Connor Brewster 2016-07-11 22:21:45 -06:00
parent 9b01a4cc97
commit afc0ccb48d
9 changed files with 79 additions and 61 deletions

View file

@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::refcounted::Trusted;
use dom::event::{EventBubbles, EventCancelable};
use dom::event::{EventBubbles, EventCancelable, EventRunnable};
use dom::eventtarget::EventTarget;
use script_thread::MainThreadScriptMsg;
use script_thread::{MainThreadScriptMsg, Runnable, ScriptThread};
use std::result::Result;
use std::sync::mpsc::Sender;
use string_cache::Atom;
@ -22,30 +22,27 @@ impl TaskSource<UserInteractionTask> for UserInteractionTaskSource {
impl UserInteractionTaskSource {
pub fn queue_event(&self,
target: &EventTarget,
name: Atom,
bubbles: EventBubbles,
cancelable: EventCancelable) {
target: &EventTarget,
name: Atom,
bubbles: EventBubbles,
cancelable: EventCancelable) {
let target = Trusted::new(target);
let _ = self.0.send(MainThreadScriptMsg::UserInteraction(UserInteractionTask::FireEvent(
target, name, bubbles, cancelable)));
let runnable = box EventRunnable {
target: target,
name: name,
bubbles: bubbles,
cancelable: cancelable,
};
let _ = self.queue(UserInteractionTask(runnable));
}
}
pub enum UserInteractionTask {
// https://dom.spec.whatwg.org/#concept-event-fire
FireEvent(Trusted<EventTarget>, Atom, EventBubbles, EventCancelable),
}
pub struct UserInteractionTask(pub Box<Runnable + Send>);
impl UserInteractionTask {
pub fn handle_task(self) {
use self::UserInteractionTask::*;
match self {
FireEvent(element, name, bubbles, cancelable) => {
let target = element.root();
target.fire_event(&*name, bubbles, cancelable);
}
pub fn handle_task(self, script_thread: &ScriptThread) {
if !self.0.is_cancelled() {
self.0.main_thread_handler(script_thread);
}
}
}