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

Rename the |wrapper| field in Reflector.

Browse source
This commit is contained in:
Bobby Holley 2013-10-09 10:38:59 +02:00
parent 549ac6a29b
commit 92e91c58da
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/script/dom/bindings/utils.rs
View file

@ -533,25 +533,25 @@ pub trait Reflectable {
} }
pub struct Reflector { pub struct Reflector {
wrapper: *JSObject object: *JSObject
} }
impl Reflector { impl Reflector {
pub fn get_jsobject(&self) -> *JSObject { pub fn get_jsobject(&self) -> *JSObject {
unsafe { cast::transmute(self.wrapper) } unsafe { cast::transmute(self.object) }
} }
pub fn set_jsobject(&mut self, wrapper: *JSObject) { pub fn set_jsobject(&mut self, object: *JSObject) {
self.wrapper = wrapper; self.object = object;
} }
pub fn get_rootable(&self) -> **JSObject { pub fn get_rootable(&self) -> **JSObject {
return to_unsafe_ptr(&self.wrapper); return to_unsafe_ptr(&self.object);
} }
pub fn new() -> Reflector { pub fn new() -> Reflector {
Reflector { Reflector {
wrapper: ptr::null() object: ptr::null()
} }
} }
} }

2
src/components/script/dom/document.rs
View file

@ -502,7 +502,7 @@ impl Traceable for Document {
debug!("tracing root node"); debug!("tracing root node");
do root.with_base |node| { do root.with_base |node| {
JS_CallTracer(tracer as *JSTracer, JS_CallTracer(tracer as *JSTracer,
node.wrapper.wrapper, node.wrapper.object,
JSTRACE_OBJECT as u32); JSTRACE_OBJECT as u32);
} }
} }

4
src/components/script/dom/window.rs
View file

@ -227,7 +227,7 @@ impl Window {
unsafe { unsafe {
let reflector = ptr::to_unsafe_ptr(win.reflector()); let reflector = ptr::to_unsafe_ptr(win.reflector());
win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope 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| { do "window".to_c_str().with_ref |name| {
JS_DefineProperty(cx, global, name, JS_DefineProperty(cx, global, name,
RUST_OBJECT_TO_JSVAL(global), RUST_OBJECT_TO_JSVAL(global),
@ -254,7 +254,7 @@ impl Traceable for Window {
(*tracer).debugPrintArg = name as *libc::c_void; (*tracer).debugPrintArg = name as *libc::c_void;
debug!("tracing document"); debug!("tracing document");
JS_CallTracer(tracer as *JSTracer, JS_CallTracer(tracer as *JSTracer,
doc.wrapper.wrapper, doc.wrapper.object,
JSTRACE_OBJECT as u32); JSTRACE_OBJECT as u32);
} }
} }