aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/browsercontext.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/browsercontext.rs')
-rw-r--r--components/script/dom/browsercontext.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 0bd96b75ec8..2c7ba17c649 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -39,28 +39,29 @@ impl BrowserContext {
pub fn active_window(&self) -> Temporary<Window> {
let doc = self.active_document().root();
- doc.window()
+ doc.r().window()
}
pub fn window_proxy(&self) -> *mut JSObject {
- assert!(self.window_proxy.is_not_null());
+ assert!(!self.window_proxy.is_null());
self.window_proxy
}
fn create_window_proxy(&mut self) {
let win = self.active_window().root();
+ let win = win.r();
let page = win.page();
let js_info = page.js_info();
let WindowProxyHandler(handler) = js_info.as_ref().unwrap().dom_static.windowproxy_handler;
- assert!(handler.is_not_null());
+ assert!(!handler.is_null());
let parent = win.reflector().get_jsobject();
let cx = js_info.as_ref().unwrap().js_context.ptr;
let wrapper = with_compartment(cx, parent, || unsafe {
WrapperNew(cx, parent, handler)
});
- assert!(wrapper.is_not_null());
+ assert!(!wrapper.is_null());
self.window_proxy = wrapper;
}
}