forked from mirrors/gecko-dev
e82a09e24a
<!-- Please describe your changes on the following line: --> This makes it so each task is a thin wrapper over a runnable and whenever a task is queued, it is automatically wrapped by the window's `runnable_wrapper`. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11703 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 3011d4b450b107f87fab54f6c59245ac1478fa79
51 lines
1.7 KiB
Rust
51 lines
1.7 KiB
Rust
/* 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 dom::bindings::refcounted::Trusted;
|
|
use dom::event::{EventBubbles, EventCancelable, EventRunnable};
|
|
use dom::eventtarget::EventTarget;
|
|
use dom::window::Window;
|
|
use script_thread::{MainThreadScriptMsg, Runnable, ScriptThread};
|
|
use std::result::Result;
|
|
use std::sync::mpsc::Sender;
|
|
use string_cache::Atom;
|
|
use task_source::TaskSource;
|
|
|
|
#[derive(JSTraceable, Clone)]
|
|
pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>);
|
|
|
|
impl TaskSource for UserInteractionTaskSource {
|
|
fn queue<T: Runnable + Send + 'static>(&self, msg: Box<T>, window: &Window) -> Result<(), ()> {
|
|
let msg = UserInteractionTask(window.get_runnable_wrapper().wrap_runnable(msg));
|
|
self.0.send(MainThreadScriptMsg::UserInteraction(msg)).map_err(|_| ())
|
|
}
|
|
}
|
|
|
|
impl UserInteractionTaskSource {
|
|
pub fn queue_event(&self,
|
|
target: &EventTarget,
|
|
name: Atom,
|
|
bubbles: EventBubbles,
|
|
cancelable: EventCancelable,
|
|
window: &Window) {
|
|
let target = Trusted::new(target);
|
|
let runnable = box EventRunnable {
|
|
target: target,
|
|
name: name,
|
|
bubbles: bubbles,
|
|
cancelable: cancelable,
|
|
};
|
|
let _ = self.queue(runnable, window);
|
|
}
|
|
}
|
|
|
|
pub struct UserInteractionTask(pub Box<Runnable + Send>);
|
|
|
|
impl UserInteractionTask {
|
|
pub fn handle_task(self, script_thread: &ScriptThread) {
|
|
if !self.0.is_cancelled() {
|
|
self.0.main_thread_handler(script_thread);
|
|
}
|
|
}
|
|
}
|