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

Make TaskSource::queue take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-04 15:49:48 +02:00
parent 514819f37a
commit 44ca9f3d71
9 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/task_source/dom_manipulation.rs
View file

@ -2,7 +2,7 @@
* 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::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::refcounted::Trusted;
use dom::event::{EventBubbles, EventCancelable, EventRunnable, SimpleEventRunnable};
use dom::eventtarget::EventTarget;
@ -41,7 +41,7 @@ impl DOMManipulationTaskSource {
bubbles: bubbles,
cancelable: cancelable,
};
let _ = self.queue(runnable, GlobalRef::Window(window));
let _ = self.queue(runnable, window.upcast());
}
pub fn queue_simple_event(&self, target: &EventTarget, name: Atom, window: &Window) {
@ -50,7 +50,7 @@ impl DOMManipulationTaskSource {
target: target,
name: name,
};
let _ = self.queue(runnable, GlobalRef::Window(window));
let _ = self.queue(runnable, window.upcast());
}
}

6
components/script/task_source/mod.rs
View file

@ -8,7 +8,7 @@ pub mod history_traversal;
pub mod networking;
pub mod user_interaction;
use dom::bindings::global::GlobalRef;
use dom::globalscope::GlobalScope;
use script_thread::{Runnable, RunnableWrapper};
use std::result::Result;
@ -18,7 +18,7 @@ pub trait TaskSource {
wrapper: &RunnableWrapper)
-> Result<(), ()>
where T: Runnable + Send + 'static;
fn queue<T: Runnable + Send + 'static>(&self, msg: Box<T>, global: GlobalRef) -> Result<(), ()> {
self.queue_with_wrapper(msg, &global.as_global_scope().get_runnable_wrapper())
fn queue<T: Runnable + Send + 'static>(&self, msg: Box<T>, global: &GlobalScope) -> Result<(), ()> {
self.queue_with_wrapper(msg, &global.get_runnable_wrapper())
}
}

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

@ -2,7 +2,7 @@
* 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::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::refcounted::Trusted;
use dom::event::{EventBubbles, EventCancelable, EventRunnable};
use dom::eventtarget::EventTarget;
@ -41,7 +41,7 @@ impl UserInteractionTaskSource {
bubbles: bubbles,
cancelable: cancelable,
};
let _ = self.queue(runnable, GlobalRef::Window(window));
let _ = self.queue(runnable, window.upcast());
}
}