diff options
author | marmeladema <xademax@gmail.com> | 2019-07-22 22:14:11 +0100 |
---|---|---|
committer | marmeladema <xademax@gmail.com> | 2019-07-24 09:53:10 +0100 |
commit | 88cacfb0098e20be70c27bfde6b74cd3290f1fe4 (patch) | |
tree | 95d7cd9ffad7eaff05114946a1e12f8e49d55fab /components/script/dom/windowproxy.rs | |
parent | 2c5d0a6ebc39ad263e2bbe623e357a11b4cec5aa (diff) | |
download | servo-88cacfb0098e20be70c27bfde6b74cd3290f1fe4.tar.gz servo-88cacfb0098e20be70c27bfde6b74cd3290f1fe4.zip |
Modify *::get_cx methods to return a safe JSContext instead of a raw one
Diffstat (limited to 'components/script/dom/windowproxy.rs')
-rw-r--r-- | components/script/dom/windowproxy.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/windowproxy.rs b/components/script/dom/windowproxy.rs index d527a73c86f..0c7a00978bc 100644 --- a/components/script/dom/windowproxy.rs +++ b/components/script/dom/windowproxy.rs @@ -152,10 +152,10 @@ impl WindowProxy { ((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL), 0 ); - let _ac = JSAutoRealm::new(cx, window_jsobject.get()); + let _ac = JSAutoRealm::new(*cx, window_jsobject.get()); // Create a new window proxy. - rooted!(in(cx) let js_proxy = NewWindowProxy(cx, window_jsobject, handler)); + rooted!(in(*cx) let js_proxy = NewWindowProxy(*cx, window_jsobject, handler)); assert!(!js_proxy.is_null()); // Create a new browsing context. @@ -178,7 +178,7 @@ impl WindowProxy { ); // Notify the JS engine about the new window proxy binding. - SetWindowProxy(cx, window_jsobject, js_proxy.handle()); + SetWindowProxy(*cx, window_jsobject, js_proxy.handle()); // Set the reflector. debug!( @@ -223,10 +223,10 @@ impl WindowProxy { ((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL), 0 ); - let _ac = JSAutoRealm::new(cx, window_jsobject.get()); + let _ac = JSAutoRealm::new(*cx, window_jsobject.get()); // Create a new window proxy. - rooted!(in(cx) let js_proxy = NewWindowProxy(cx, window_jsobject, handler)); + rooted!(in(*cx) let js_proxy = NewWindowProxy(*cx, window_jsobject, handler)); assert!(!js_proxy.is_null()); // The window proxy owns the browsing context. @@ -238,7 +238,7 @@ impl WindowProxy { ); // Notify the JS engine about the new window proxy binding. - SetWindowProxy(cx, window_jsobject, js_proxy.handle()); + SetWindowProxy(*cx, window_jsobject, js_proxy.handle()); // Set the reflector. debug!( @@ -576,20 +576,20 @@ impl WindowProxy { // of the old window proxy to the new window proxy, then // making the old window proxy a cross-compartment wrapper // pointing to the new window proxy. - rooted!(in(cx) let new_js_proxy = NewWindowProxy(cx, window_jsobject, handler)); + rooted!(in(*cx) let new_js_proxy = NewWindowProxy(*cx, window_jsobject, handler)); debug!( "Transplanting proxy from {:p} to {:p}.", old_js_proxy.get(), new_js_proxy.get() ); - rooted!(in(cx) let new_js_proxy = JS_TransplantObject(cx, old_js_proxy, new_js_proxy.handle())); + rooted!(in(*cx) let new_js_proxy = JS_TransplantObject(*cx, old_js_proxy, new_js_proxy.handle())); debug!("Transplanted proxy is {:p}.", new_js_proxy.get()); // Transfer ownership of this browsing context from the old window proxy to the new one. SetProxyReservedSlot(new_js_proxy.get(), 0, &PrivateValue(self.as_void_ptr())); // Notify the JS engine about the new window proxy binding. - SetWindowProxy(cx, window_jsobject, new_js_proxy.handle()); + SetWindowProxy(*cx, window_jsobject, new_js_proxy.handle()); // Update the reflector. debug!( |