diff options
30 files changed, 60 insertions, 60 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 38a31aadeed..5455ca8d4bb 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2464,7 +2464,7 @@ class CGAbstractMethod(CGThing): def CreateBindingJSObject(descriptor, parent=None): if descriptor.proxy: - handler = """ //let cache = ptr::to_unsafe_ptr(aObject.get_wrappercache()); + handler = """ //let reflector = ptr::to_unsafe_ptr(aObject.reflector()); let page = page_from_context(aCx); let handler = (*page).js_info.get_ref().dom_static.proxy_handlers.get(&(PrototypeList::id::%s as uint)); @@ -2520,20 +2520,20 @@ class CGWrapWithCacheMethod(CGAbstractMethod): return ptr::null(); } - let cache = ptr::to_mut_unsafe_ptr(aObject.get_wrappercache()); + let reflector = ptr::to_mut_unsafe_ptr(aObject.reflector()); %s //NS_ADDREF(aObject); - (*cache).set_wrapper(obj); + (*reflector).set_wrapper(obj); return obj;""" % (CreateBindingJSObject(self.descriptor, "parent")) else: - return """ let cache = ptr::to_mut_unsafe_ptr(aObject.get_wrappercache()); + return """ let reflector = ptr::to_mut_unsafe_ptr(aObject.reflector()); %s let proto = GetProtoObject(aCx, obj, obj); JS_SetPrototype(aCx, obj, proto); - (*cache).set_wrapper(obj); + (*reflector).set_wrapper(obj); return obj;""" % CreateBindingJSObject(self.descriptor) class CGWrapMethod(CGAbstractMethod): @@ -4077,7 +4077,7 @@ class CGClassConstructHook(CGAbstractExternMethod): // from the context for now. let page = page_from_context(cx); let global = (*page).frame.get_ref().window; - let obj = global.get_wrappercache().get_wrapper(); + let obj = global.reflector().get_wrapper(); """ preArgs = ["global"] diff --git a/src/components/script/dom/bindings/domparser.rs b/src/components/script/dom/bindings/domparser.rs index 98d745d8cc8..32ab990aa27 100644 --- a/src/components/script/dom/bindings/domparser.rs +++ b/src/components/script/dom/bindings/domparser.rs @@ -13,7 +13,7 @@ use js::glue::{RUST_OBJECT_TO_JSVAL}; use std::cast; impl Reflectable for DOMParser { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index abe2ff946b9..4f118153582 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -12,8 +12,8 @@ use js::jsapi::{JSContext, JSObject, JSTracer}; macro_rules! generate_cacheable_wrapper( ($name: path, $wrap: path) => ( impl Reflectable for $name { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.element.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.element.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { @@ -27,8 +27,8 @@ macro_rules! generate_cacheable_wrapper( macro_rules! generate_cacheable_wrapper_htmlelement( ($name: path, $wrap: path) => ( impl Reflectable for $name { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.htmlelement.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.htmlelement.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { @@ -42,8 +42,8 @@ macro_rules! generate_cacheable_wrapper_htmlelement( macro_rules! generate_cacheable_wrapper_node( ($name: path, $wrap: path) => ( impl Reflectable for $name { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.node.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.node.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index e14d7c46036..4e2297fd229 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -96,7 +96,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject } impl Reflectable for AbstractNode<ScriptView> { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { do self.with_mut_base |base| { unsafe { cast::transmute(&base.wrapper) @@ -118,7 +118,7 @@ impl Traceable for Node<ScriptView> { } debug!("tracing %s", name); let mut node = node.unwrap(); - let cache = node.get_wrappercache(); + let cache = node.reflector(); let wrapper = cache.get_wrapper(); assert!(wrapper.is_not_null()); unsafe { diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 4270eef0a6f..e59c007df96 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -528,7 +528,7 @@ pub fn initialize_global(global: *JSObject) { } pub trait Reflectable { - fn get_wrappercache(&mut self) -> &mut Reflector; + fn reflector(&mut self) -> &mut Reflector; fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject; } @@ -561,7 +561,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, value: @mut Reflectable, vp: *mut JSVal) -> JSBool { unsafe { - let cache = value.get_wrappercache(); + let cache = value.reflector(); let obj = cache.get_wrapper(); if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { *vp = RUST_OBJECT_TO_JSVAL(obj); @@ -584,7 +584,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Reflectable>) -> *JSObject { match p { Some(ref mut p) => { - let cache = p.get_wrappercache(); + let cache = p.reflector(); let wrapper = cache.get_wrapper(); if wrapper.is_not_null() { return wrapper; @@ -734,7 +734,7 @@ pub trait DerivedWrapper { impl DerivedWrapper for AbstractNode<ScriptView> { #[fixed_stack_segment] fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { - let cache = self.get_wrappercache(); + let cache = self.reflector(); let wrapper = cache.get_wrapper(); if wrapper.is_not_null() { unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 807a144635e..af3eef00443 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -23,7 +23,7 @@ impl Blob { } impl Reflectable for Blob { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index 67e298beede..42340e4bff3 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -58,8 +58,8 @@ impl CharacterData { } impl Reflectable for CharacterData { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.node.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.node.reflector() } fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index 316bd900dc3..9fb27e0178a 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -62,7 +62,7 @@ impl ClientRect { } impl Reflectable for ClientRect { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index e5e7c8a9238..6fd9794d996 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -49,7 +49,7 @@ impl ClientRectList { } impl Reflectable for ClientRectList { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 1b1558e4657..27bcd8f28b4 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -132,9 +132,9 @@ impl WrappableDocument for Document { } impl Reflectable for AbstractDocument { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { do self.with_mut_base |doc| { - doc.get_wrappercache() + doc.reflector() } } @@ -162,7 +162,7 @@ impl BindingObject for AbstractDocument { impl DerivedWrapper for AbstractDocument { #[fixed_stack_segment] fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { - let cache = self.get_wrappercache(); + let cache = self.reflector(); let wrapper = cache.get_wrapper(); unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; return 1; @@ -175,7 +175,7 @@ impl DerivedWrapper for AbstractDocument { impl Reflectable for Document { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } @@ -229,7 +229,7 @@ impl Document { fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { let win = self.window.get_ref(); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index d006bf55fee..d4b56af504c 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -27,7 +27,7 @@ impl DOMParser { // TODO(tkuehn): This just handles the top-level page. Need to handle subframes. let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = owner.get_wrappercache(); + let cache = owner.reflector(); let scope = cache.get_wrapper(); parser.wrap_object_shared(cx, scope); parser diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index b10c2ccdc31..86c429e55ec 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -29,8 +29,8 @@ pub struct Element { } impl Reflectable for Element { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.node.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.node.reflector() } fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { @@ -191,7 +191,7 @@ impl<'self> Element { let doc = self.node.owner_doc.unwrap(); let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } @@ -287,7 +287,7 @@ impl Element { match page.query_layout(ContentBoxesQuery(node, chan), port) { ContentBoxesResponse(rects) => { let cx = page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); let rects = do rects.map |r| { ClientRect::new( @@ -315,7 +315,7 @@ impl Element { match page.query_layout(ContentBoxQuery(node, chan), port) { ContentBoxResponse(rect) => { let cx = page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); ClientRect::new( rect.origin.y.to_f32(), diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 1c9583ed1fb..deb4e46362c 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -114,7 +114,7 @@ impl Event { } impl Reflectable for Event { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index eb417e513a0..401bb36ce53 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -28,7 +28,7 @@ impl EventTarget { } impl Reflectable for EventTarget { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 1a6bacc2871..bcd993d397e 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -50,7 +50,7 @@ impl FormData { } impl Reflectable for FormData { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index c58d9d15b59..cc137cd95fa 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -69,7 +69,7 @@ impl BindingObject for HTMLCollection { } impl Reflectable for HTMLCollection { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index 1590f079762..b782403f13b 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -17,7 +17,7 @@ impl HTMLDataListElement { let doc = self.htmlelement.element.node.owner_doc.unwrap(); let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index 7d5ff34f4b8..66f813dc9af 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -36,7 +36,7 @@ impl HTMLDocument { fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { let win = self.parent.window.get_ref(); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } @@ -201,8 +201,8 @@ impl HTMLDocument { } impl Reflectable for HTMLDocument { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.parent.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.parent.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index 64092156a78..612b7f414ee 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -149,8 +149,8 @@ impl HTMLElement { } impl Reflectable for HTMLElement { - fn get_wrappercache(&mut self) -> &mut Reflector { - self.element.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + self.element.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 164890043b5..285c6371f69 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -43,7 +43,7 @@ impl HTMLFieldSetElement { let doc = self.htmlelement.element.node.owner_doc.unwrap(); let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index 2bb7d42684a..52ed2c44ac3 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -19,7 +19,7 @@ impl HTMLFormElement { let doc = self.htmlelement.element.node.owner_doc.unwrap(); let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index 5fd54975f2d..203008ccd7b 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -24,7 +24,7 @@ impl HTMLMapElement { let doc = self.htmlelement.element.node.owner_doc.unwrap(); let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; - let cache = win.get_wrappercache(); + let cache = win.reflector(); let scope = cache.get_wrapper(); (scope, cx) } diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index b010233af1d..1f6968235eb 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -143,8 +143,8 @@ impl MouseEvent { } impl Reflectable for MouseEvent { - fn get_wrappercache(&mut self) -> &mut Reflector { - return self.parent.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + return self.parent.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index c7779a6911f..d2a3dc6b5ac 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -88,7 +88,7 @@ impl Navigator { } impl Reflectable for Navigator { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index d4e5bebce01..3e7c9e1e097 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -790,7 +790,7 @@ impl VoidPtrLike for AbstractNode<LayoutView> { } impl Reflectable for Node<ScriptView> { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&mut self.wrapper) } } diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index a21a2192ffe..d4b6b89c20e 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -116,8 +116,8 @@ impl UIEvent { } impl Reflectable for UIEvent { - fn get_wrappercache(&mut self) -> &mut Reflector { - return self.parent.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + return self.parent.reflector() } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index 25bb25d91e6..e2c207bd5c6 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -60,7 +60,7 @@ impl ValidityState { } impl Reflectable for ValidityState { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index cf98ed190df..476263cf4b0 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -136,7 +136,7 @@ impl Window { } impl Reflectable for Window { - fn get_wrappercache(&mut self) -> &mut Reflector { + fn reflector(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } @@ -225,7 +225,7 @@ impl Window { }; unsafe { - let cache = ptr::to_unsafe_ptr(win.get_wrappercache()); + let cache = ptr::to_unsafe_ptr(win.reflector()); win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope let global = (*cache).wrapper; do "window".to_c_str().with_ref |name| { diff --git a/src/components/script/dom/windowproxy.rs b/src/components/script/dom/windowproxy.rs index 97f82a87403..fe31dedf50c 100644 --- a/src/components/script/dom/windowproxy.rs +++ b/src/components/script/dom/windowproxy.rs @@ -33,8 +33,8 @@ impl BindingObject for WindowProxy { } impl Reflectable for WindowProxy { - fn get_wrappercache(&mut self) -> &mut Reflector { - return self.get_wrappercache() + fn reflector(&mut self) -> &mut Reflector { + return self.reflector() } fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject { diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 1242b2732e1..9c3d240de27 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -707,7 +707,7 @@ impl ScriptTask { self.chan.clone(), self.compositor, self.image_cache_task.clone()); - page.initialize_js_info(cx, window.get_wrappercache().get_wrapper()); + page.initialize_js_info(cx, window.reflector().get_wrapper()); RegisterBindings::Register(page.js_info.get_ref().js_compartment); |