diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-05 10:29:38 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 21:36:00 +0200 |
commit | b6bbd41e11a8d73f884b7011905c05bd3efec3cd (patch) | |
tree | 44bf2af511f941aac3ff449b1b4b088f0286077c /components/script/dom/bindings/callback.rs | |
parent | c66cf46bee6306ba8cb51f22c0d704c31c17d0fd (diff) | |
download | servo-b6bbd41e11a8d73f884b7011905c05bd3efec3cd.tar.gz servo-b6bbd41e11a8d73f884b7011905c05bd3efec3cd.zip |
Remove GlobalRoot and GlobalRef
Diffstat (limited to 'components/script/dom/bindings/callback.rs')
-rw-r--r-- | components/script/dom/bindings/callback.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index c9fb9fd8a53..709dab31049 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -5,8 +5,8 @@ //! Base classes to work with IDL callbacks. use dom::bindings::error::{Error, Fallible, report_pending_exception}; -use dom::bindings::global::global_scope_from_object; use dom::bindings::reflector::Reflectable; +use dom::globalscope::GlobalScope; use js::jsapi::{Heap, MutableHandleObject, RootedObject}; use js::jsapi::{IsCallable, JSContext, JSObject, JS_WrapObject}; use js::jsapi::{JSCompartment, JS_EnterCompartment, JS_LeaveCompartment}; @@ -165,7 +165,7 @@ impl<'a> CallSetup<'a> { callback: &T, handling: ExceptionHandling) -> CallSetup<'a> { - let global = unsafe { global_scope_from_object(callback.callback()) }; + let global = unsafe { GlobalScope::from_object(callback.callback()) }; let cx = global.get_cx(); exception_compartment.ptr = unsafe { |