diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-07 07:52:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-07 07:52:09 -0500 |
commit | a6e4b5bb86ad707a0863acff87344ca4239cfd2c (patch) | |
tree | c820d9f2420c44cdfe29de97f1a710e7dc354bb7 /components/script/task_source/mod.rs | |
parent | e23959a7618e8e7b7ca20300a2afeb1ac77712f3 (diff) | |
parent | d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4 (diff) | |
download | servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.tar.gz servo-a6e4b5bb86ad707a0863acff87344ca4239cfd2c.zip |
Auto merge of #13596 - nox:inline, r=Ms2ger
Get rid of dom::bindings::global
Globals in that PR are now represented by the fake IDL interface `GlobalScope`.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13596)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/task_source/mod.rs')
-rw-r--r-- | components/script/task_source/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs index cb607c57acb..6e2a9985fa0 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -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<(), ()> { + fn queue<T: Runnable + Send + 'static>(&self, msg: Box<T>, global: &GlobalScope) -> Result<(), ()> { self.queue_with_wrapper(msg, &global.get_runnable_wrapper()) } } |