diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 0da11e1ad44..9e57171643a 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -10,7 +10,6 @@ use dom::bindings::conversions::IDLInterface; use dom::bindings::error::throw_type_error; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, Temporary, Root}; -use dom::bindings::trace::Untraceable; use dom::browsercontext; use dom::window; use servo_util::str::DOMString; @@ -53,12 +52,12 @@ use js; #[allow(raw_pointer_deriving)] #[jstraceable] pub struct GlobalStaticData { - pub windowproxy_handler: Untraceable<*const libc::c_void>, + pub windowproxy_handler: *const libc::c_void, } pub fn GlobalStaticData() -> GlobalStaticData { GlobalStaticData { - windowproxy_handler: Untraceable::new(browsercontext::new_window_proxy_handler()), + windowproxy_handler: browsercontext::new_window_proxy_handler(), } } diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index dbd41ca5702..6140dd02a32 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -53,12 +53,12 @@ impl BrowserContext { let js_info = page.js_info(); let handler = js_info.as_ref().unwrap().dom_static.windowproxy_handler; - assert!(handler.deref().is_not_null()); + assert!(handler.is_not_null()); let parent = win.deref().reflector().get_jsobject(); let cx = js_info.as_ref().unwrap().js_context.deref().ptr; let wrapper = with_compartment(cx, parent, || unsafe { - WrapperNew(cx, parent, *handler.deref()) + WrapperNew(cx, parent, handler) }); assert!(wrapper.is_not_null()); self.window_proxy = wrapper;