diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-05 10:24:21 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 21:35:59 +0200 |
commit | c66cf46bee6306ba8cb51f22c0d704c31c17d0fd (patch) | |
tree | 6aac14a7c2cfd53f62e7e6b9e137569e70749ad3 /components/script/script_thread.rs | |
parent | 996fd284e29c0406b185a429e7e5cd40405bee35 (diff) | |
download | servo-c66cf46bee6306ba8cb51f22c0d704c31c17d0fd.tar.gz servo-c66cf46bee6306ba8cb51f22c0d704c31c17d0fd.zip |
Make the closure in flush_promise_jobs return a Root<GlobalScope>
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 22ca69c78df..85f0cc2462e 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -27,7 +27,6 @@ use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, Documen use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior}; -use dom::bindings::global::GlobalRoot; use dom::bindings::inheritance::Castable; use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection}; use dom::bindings::js::{RootCollectionPtr, RootedReference}; @@ -2190,7 +2189,9 @@ impl ScriptThread { fn do_flush_promise_jobs(&self) { self.promise_job_queue.flush_promise_jobs(|id| { - self.find_child_context(id).map(|context| GlobalRoot::Window(context.active_window())) + self.find_child_context(id).map(|context| { + Root::upcast(context.active_window()) + }) }); } } |