diff options
Diffstat (limited to 'src/components/script/dom')
-rw-r--r-- | src/components/script/dom/bindings/utils.rs | 12 | ||||
-rw-r--r-- | src/components/script/dom/document.rs | 2 | ||||
-rw-r--r-- | src/components/script/dom/window.rs | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 56b28298a07..fad4d4c83fd 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -533,25 +533,25 @@ pub trait Reflectable { } pub struct Reflector { - wrapper: *JSObject + object: *JSObject } impl Reflector { pub fn get_jsobject(&self) -> *JSObject { - unsafe { cast::transmute(self.wrapper) } + unsafe { cast::transmute(self.object) } } - pub fn set_jsobject(&mut self, wrapper: *JSObject) { - self.wrapper = wrapper; + pub fn set_jsobject(&mut self, object: *JSObject) { + self.object = object; } pub fn get_rootable(&self) -> **JSObject { - return to_unsafe_ptr(&self.wrapper); + return to_unsafe_ptr(&self.object); } pub fn new() -> Reflector { Reflector { - wrapper: ptr::null() + object: ptr::null() } } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index ad197804348..9bdeaa1f608 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -502,7 +502,7 @@ impl Traceable for Document { debug!("tracing root node"); do root.with_base |node| { JS_CallTracer(tracer as *JSTracer, - node.wrapper.wrapper, + node.wrapper.object, JSTRACE_OBJECT as u32); } } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 7bfbfa78391..816d13ed6c2 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -227,7 +227,7 @@ impl Window { unsafe { let reflector = ptr::to_unsafe_ptr(win.reflector()); win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope - let global = (*reflector).wrapper; + let global = (*reflector).object; do "window".to_c_str().with_ref |name| { JS_DefineProperty(cx, global, name, RUST_OBJECT_TO_JSVAL(global), @@ -254,7 +254,7 @@ impl Traceable for Window { (*tracer).debugPrintArg = name as *libc::c_void; debug!("tracing document"); JS_CallTracer(tracer as *JSTracer, - doc.wrapper.wrapper, + doc.wrapper.object, JSTRACE_OBJECT as u32); } } |