Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove Untraceable from utils.rs

Browse source
This commit is contained in:
Manish Goregaokar 2014-09-29 07:03:48 +05:30
parent dcbb941300
commit b7c3a1cd5d
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/bindings/utils.rs
View file

@ -10,7 +10,6 @@ use dom::bindings::conversions::IDLInterface;
use dom::bindings::error::throw_type_error; use dom::bindings::error::throw_type_error;
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Temporary, Root}; use dom::bindings::js::{JS, Temporary, Root};
use dom::bindings::trace::Untraceable;
use dom::browsercontext; use dom::browsercontext;
use dom::window; use dom::window;
use servo_util::str::DOMString; use servo_util::str::DOMString;
@ -53,12 +52,12 @@ use js;
#[allow(raw_pointer_deriving)] #[allow(raw_pointer_deriving)]
#[jstraceable] #[jstraceable]
pub struct GlobalStaticData { pub struct GlobalStaticData {
pub windowproxy_handler: Untraceable<*const libc::c_void>, pub windowproxy_handler: *const libc::c_void,
} }
pub fn GlobalStaticData() -> GlobalStaticData { pub fn GlobalStaticData() -> GlobalStaticData {
GlobalStaticData { GlobalStaticData {
windowproxy_handler: Untraceable::new(browsercontext::new_window_proxy_handler()), windowproxy_handler: browsercontext::new_window_proxy_handler(),
} }
} }

4
components/script/dom/browsercontext.rs
View file

@ -53,12 +53,12 @@ impl BrowserContext {
let js_info = page.js_info(); let js_info = page.js_info();
let handler = js_info.as_ref().unwrap().dom_static.windowproxy_handler; 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 parent = win.deref().reflector().get_jsobject();
let cx = js_info.as_ref().unwrap().js_context.deref().ptr; let cx = js_info.as_ref().unwrap().js_context.deref().ptr;
let wrapper = with_compartment(cx, parent, || unsafe { let wrapper = with_compartment(cx, parent, || unsafe {
WrapperNew(cx, parent, *handler.deref()) WrapperNew(cx, parent, handler)
}); });
assert!(wrapper.is_not_null()); assert!(wrapper.is_not_null());
self.window_proxy = wrapper; self.window_proxy = wrapper;