From 0a0599ad9b0c8723e94bd0889cda00d87250c64d Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 8 Oct 2013 20:04:29 +0200 Subject: [PATCH 1/8] Rename CacheableWrapper to Reflectable. --- .../script/dom/bindings/codegen/CodegenRust.py | 4 ++-- src/components/script/dom/bindings/domparser.rs | 8 ++++---- src/components/script/dom/bindings/element.rs | 14 +++++++------- src/components/script/dom/bindings/node.rs | 4 ++-- src/components/script/dom/bindings/utils.rs | 8 ++++---- src/components/script/dom/blob.rs | 8 ++++---- src/components/script/dom/characterdata.rs | 6 +++--- src/components/script/dom/clientrect.rs | 8 ++++---- src/components/script/dom/clientrectlist.rs | 8 ++++---- src/components/script/dom/document.rs | 12 ++++++------ src/components/script/dom/domparser.rs | 2 +- src/components/script/dom/element.rs | 6 +++--- src/components/script/dom/event.rs | 8 ++++---- src/components/script/dom/eventtarget.rs | 8 ++++---- src/components/script/dom/formdata.rs | 8 ++++---- src/components/script/dom/htmlcollection.rs | 8 ++++---- src/components/script/dom/htmldatalistelement.rs | 2 +- src/components/script/dom/htmldocument.rs | 6 +++--- src/components/script/dom/htmlelement.rs | 6 +++--- src/components/script/dom/htmlfieldsetelement.rs | 2 +- src/components/script/dom/htmlformelement.rs | 2 +- src/components/script/dom/htmlmapelement.rs | 2 +- src/components/script/dom/mouseevent.rs | 6 +++--- src/components/script/dom/navigator.rs | 8 ++++---- src/components/script/dom/node.rs | 10 +++++----- src/components/script/dom/uievent.rs | 6 +++--- src/components/script/dom/validitystate.rs | 6 +++--- src/components/script/dom/window.rs | 6 +++--- src/components/script/dom/windowproxy.rs | 8 ++++---- src/components/script/script_task.rs | 2 +- 30 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 13a03c91c08..38a31aadeed 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1533,7 +1533,7 @@ for (uint32_t i = 0; i < length; ++i) { if descriptor.pointerType == '': wrap = "%s.wrap(cx, ${obj}, ${jsvalPtr} as *mut JSVal)" % result else: - wrap = "%s(cx, ${obj}, %s as @mut CacheableWrapper, ${jsvalPtr} as *mut JSVal)" % (wrapMethod, result) + wrap = "%s(cx, ${obj}, %s as @mut Reflectable, ${jsvalPtr} as *mut JSVal)" % (wrapMethod, result) # We don't support prefable stuff in workers. assert(not descriptor.prefable or not descriptor.workers) if not descriptor.prefable: @@ -1555,7 +1555,7 @@ for (uint32_t i = 0; i < length; ++i) { if descriptor.pointerType == '': wrap = "(%s.wrap(cx, ${obj}, ${jsvalPtr}) != 0)" % result else: - wrap = "if WrapNewBindingObject(cx, ${obj}, %s as @mut CacheableWrapper, ${jsvalPtr}) { 1 } else { 0 };" % result + wrap = "if WrapNewBindingObject(cx, ${obj}, %s as @mut Reflectable, ${jsvalPtr}) { 1 } else { 0 };" % result wrappingCode += wrapAndSetPtr(wrap) return (wrappingCode, False) diff --git a/src/components/script/dom/bindings/domparser.rs b/src/components/script/dom/bindings/domparser.rs index 42e1f5146a0..12b12c524b0 100644 --- a/src/components/script/dom/bindings/domparser.rs +++ b/src/components/script/dom/bindings/domparser.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DOMParserBinding; -use dom::bindings::utils::{CacheableWrapper, WrapperCache}; +use dom::bindings::utils::{Reflectable, WrapperCache}; use dom::bindings::utils::{BindingObject, DerivedWrapper}; use dom::domparser::DOMParser; @@ -12,7 +12,7 @@ use js::glue::{RUST_OBJECT_TO_JSVAL}; use std::cast; -impl CacheableWrapper for DOMParser { +impl Reflectable for DOMParser { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -24,8 +24,8 @@ impl CacheableWrapper for DOMParser { } impl BindingObject for DOMParser { - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut CacheableWrapper> { - Some(self.owner as @mut CacheableWrapper) + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { + Some(self.owner as @mut Reflectable) } } diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index 98479fa6556..4dd4495756a 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -4,14 +4,14 @@ use dom::types::*; use dom::bindings::codegen::*; -use dom::bindings::utils::{BindingObject, WrapperCache, CacheableWrapper, Traceable}; +use dom::bindings::utils::{BindingObject, WrapperCache, Reflectable, Traceable}; use dom::node::ScriptView; use js::jsapi::{JSContext, JSObject, JSTracer}; macro_rules! generate_cacheable_wrapper( ($name: path, $wrap: path) => ( - impl CacheableWrapper for $name { + impl Reflectable for $name { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.element.get_wrappercache() } @@ -26,7 +26,7 @@ macro_rules! generate_cacheable_wrapper( macro_rules! generate_cacheable_wrapper_htmlelement( ($name: path, $wrap: path) => ( - impl CacheableWrapper for $name { + impl Reflectable for $name { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.htmlelement.get_wrappercache() } @@ -41,7 +41,7 @@ macro_rules! generate_cacheable_wrapper_htmlelement( macro_rules! generate_cacheable_wrapper_node( ($name: path, $wrap: path) => ( - impl CacheableWrapper for $name { + impl Reflectable for $name { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.node.get_wrappercache() } @@ -57,7 +57,7 @@ macro_rules! generate_cacheable_wrapper_node( macro_rules! generate_binding_object( ($name: path) => ( impl BindingObject for $name { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.element.GetParentObject(cx) } } @@ -67,7 +67,7 @@ macro_rules! generate_binding_object( macro_rules! generate_binding_object_htmlelement( ($name: path) => ( impl BindingObject for $name { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.htmlelement.GetParentObject(cx) } } @@ -77,7 +77,7 @@ macro_rules! generate_binding_object_htmlelement( macro_rules! generate_binding_object_node( ($name: path) => ( impl BindingObject for $name { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node.GetParentObject(cx) } } diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index a453d5d66c8..94f1dccfbd8 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{CacheableWrapper, WrapperCache, Traceable}; +use dom::bindings::utils::{Reflectable, WrapperCache, Traceable}; use dom::element::*; use dom::types::*; use dom::node::{AbstractNode, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; @@ -95,7 +95,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject } } -impl CacheableWrapper for AbstractNode { +impl Reflectable for AbstractNode { fn get_wrappercache(&mut self) -> &mut WrapperCache { do self.with_mut_base |base| { unsafe { diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index bb405b3a473..ef1cb11bee3 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -527,7 +527,7 @@ pub fn initialize_global(global: *JSObject) { } } -pub trait CacheableWrapper { +pub trait Reflectable { fn get_wrappercache(&mut self) -> &mut WrapperCache; fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject; } @@ -558,7 +558,7 @@ impl WrapperCache { #[fixed_stack_segment] pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, - value: @mut CacheableWrapper, + value: @mut Reflectable, vp: *mut JSVal) -> JSBool { unsafe { let cache = value.get_wrappercache(); @@ -581,7 +581,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, } #[fixed_stack_segment] -pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut CacheableWrapper>) -> *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(); @@ -598,7 +598,7 @@ pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Cac } pub trait BindingObject { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper>; + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable>; } #[fixed_stack_segment] diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 194979b2b2d..6849f75f490 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, CacheableWrapper}; +use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; use dom::bindings::codegen::BlobBinding; use script_task::{page_from_context}; @@ -22,7 +22,7 @@ impl Blob { } } -impl CacheableWrapper for Blob { +impl Reflectable for Blob { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -34,10 +34,10 @@ impl CacheableWrapper for Blob { } impl BindingObject for Blob { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index f7e0587455b..20e9fc7b46a 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -5,7 +5,7 @@ //! DOM bindings for `CharacterData`. use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; -use dom::bindings::utils::{BindingObject, CacheableWrapper, WrapperCache}; +use dom::bindings::utils::{BindingObject, Reflectable, WrapperCache}; use dom::node::{Node, NodeTypeId, ScriptView}; use js::jsapi::{JSObject, JSContext}; @@ -57,7 +57,7 @@ impl CharacterData { } } -impl CacheableWrapper for CharacterData { +impl Reflectable for CharacterData { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.node.get_wrappercache() } @@ -68,7 +68,7 @@ impl CacheableWrapper for CharacterData { } impl BindingObject for CharacterData { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node.GetParentObject(cx) } } diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index 5062aabdff0..1adada978aa 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; use dom::bindings::codegen::ClientRectBinding; use script_task::page_from_context; @@ -61,7 +61,7 @@ impl ClientRect { } } -impl CacheableWrapper for ClientRect { +impl Reflectable for ClientRect { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) @@ -75,10 +75,10 @@ impl CacheableWrapper for ClientRect { } impl BindingObject for ClientRect { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index b9a7f8c7f1a..2b6cd819ada 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::ClientRectListBinding; -use dom::bindings::utils::{WrapperCache, CacheableWrapper, BindingObject}; +use dom::bindings::utils::{WrapperCache, Reflectable, BindingObject}; use dom::clientrect::ClientRect; use script_task::page_from_context; @@ -48,7 +48,7 @@ impl ClientRectList { } } -impl CacheableWrapper for ClientRectList { +impl Reflectable for ClientRectList { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) @@ -62,10 +62,10 @@ impl CacheableWrapper for ClientRectList { } impl BindingObject for ClientRectList { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 84643ddb55a..ce5f4fbc35f 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::DocumentBinding; use dom::bindings::utils::{DOMString, WrapperCache, ErrorResult, Fallible}; -use dom::bindings::utils::{BindingObject, CacheableWrapper, DerivedWrapper}; +use dom::bindings::utils::{BindingObject, Reflectable, DerivedWrapper}; use dom::bindings::utils::{is_valid_element_name, InvalidCharacter, Traceable, null_str_as_empty}; use dom::element::{Element}; use dom::element::{HTMLHtmlElementTypeId, HTMLHeadElementTypeId, HTMLTitleElementTypeId}; @@ -131,7 +131,7 @@ impl WrappableDocument for Document { } } -impl CacheableWrapper for AbstractDocument { +impl Reflectable for AbstractDocument { fn get_wrappercache(&mut self) -> &mut WrapperCache { do self.with_mut_base |doc| { doc.get_wrappercache() @@ -152,7 +152,7 @@ impl CacheableWrapper for AbstractDocument { } impl BindingObject for AbstractDocument { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { do self.with_mut_base |doc| { doc.GetParentObject(cx) } @@ -174,7 +174,7 @@ impl DerivedWrapper for AbstractDocument { } -impl CacheableWrapper for Document { +impl Reflectable for Document { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) @@ -188,9 +188,9 @@ impl CacheableWrapper for Document { } impl BindingObject for Document { - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { match self.window { - Some(win) => Some(win as @mut CacheableWrapper), + Some(win) => Some(win as @mut Reflectable), None => None } } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index ddfa8d5280f..31aa0e2a850 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::DOMParserBinding; use dom::bindings::codegen::DOMParserBinding::SupportedTypeValues::{Text_html, Text_xml}; -use dom::bindings::utils::{DOMString, Fallible, WrapperCache, CacheableWrapper}; +use dom::bindings::utils::{DOMString, Fallible, WrapperCache, Reflectable}; use dom::document::{AbstractDocument, Document, XML}; use dom::element::HTMLHtmlElementTypeId; use dom::htmldocument::HTMLDocument; diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index e1a778cb2ef..553398d1e6c 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -4,7 +4,7 @@ //! Element nodes. -use dom::bindings::utils::{BindingObject, CacheableWrapper, DOMString, ErrorResult, Fallible, WrapperCache}; +use dom::bindings::utils::{BindingObject, Reflectable, DOMString, ErrorResult, Fallible, WrapperCache}; use dom::bindings::utils::{null_str_as_empty, null_str_as_empty_ref}; use dom::htmlcollection::HTMLCollection; use dom::clientrect::ClientRect; @@ -28,7 +28,7 @@ pub struct Element { style_attribute: Option, } -impl CacheableWrapper for Element { +impl Reflectable for Element { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.node.get_wrappercache() } @@ -39,7 +39,7 @@ impl CacheableWrapper for Element { } impl BindingObject for Element { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.node.GetParentObject(cx) } } diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 745bd323581..3928c84067c 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -5,7 +5,7 @@ use dom::eventtarget::EventTarget; use dom::window::Window; use dom::bindings::codegen::EventBinding; -use dom::bindings::utils::{CacheableWrapper, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, BindingObject, DerivedWrapper}; use dom::bindings::utils::{DOMString, ErrorResult, Fallible, WrapperCache}; use geom::point::Point2D; @@ -113,7 +113,7 @@ impl Event { } } -impl CacheableWrapper for Event { +impl Reflectable for Event { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -125,10 +125,10 @@ impl CacheableWrapper for Event { } impl BindingObject for Event { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 74e2a0a9bca..dc60979e551 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::EventTargetBinding; -use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; use script_task::page_from_context; use js::glue::RUST_OBJECT_TO_JSVAL; @@ -27,7 +27,7 @@ impl EventTarget { } } -impl CacheableWrapper for EventTarget { +impl Reflectable for EventTarget { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -39,11 +39,11 @@ impl CacheableWrapper for EventTarget { } impl BindingObject for EventTarget { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); // TODO(tkuehn): This only handles top-level pages. Needs to handle subframes. unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 008f524091e..b86f43f0fd5 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{CacheableWrapper, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, BindingObject, DerivedWrapper}; use dom::bindings::utils::{WrapperCache, DOMString, null_str_as_empty}; use dom::bindings::codegen::FormDataBinding; use dom::blob::Blob; @@ -49,7 +49,7 @@ impl FormData { } } -impl CacheableWrapper for FormData { +impl Reflectable for FormData { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) @@ -63,10 +63,10 @@ impl CacheableWrapper for FormData { } impl BindingObject for FormData { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index a16b2090355..bcc68145010 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLCollectionBinding; -use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; use dom::bindings::utils::{DOMString, Fallible}; use dom::node::{AbstractNode, ScriptView}; use script_task::page_from_context; @@ -59,16 +59,16 @@ impl HTMLCollection { } impl BindingObject for HTMLCollection { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); // TODO(tkuehn): This only handles the top-level frame. Need to grab subframes. unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } -impl CacheableWrapper for HTMLCollection { +impl Reflectable for HTMLCollection { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index f83c60b004f..1590f079762 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::CacheableWrapper; +use dom::bindings::utils::Reflectable; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index c96785bdc99..a7feb52b5fa 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLDocumentBinding; use dom::bindings::utils::{DOMString, ErrorResult, Fallible, Traceable}; -use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; use dom::document::{AbstractDocument, Document, WrappableDocument, HTML}; use dom::element::HTMLHeadElementTypeId; use dom::htmlcollection::HTMLCollection; @@ -200,7 +200,7 @@ impl HTMLDocument { } } -impl CacheableWrapper for HTMLDocument { +impl Reflectable for HTMLDocument { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.parent.get_wrappercache() } @@ -212,7 +212,7 @@ impl CacheableWrapper for HTMLDocument { } impl BindingObject for HTMLDocument { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } } diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index f8aa34a8936..79c79c3605e 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLElementBinding; use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; -use dom::bindings::utils::{CacheableWrapper, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; use dom::element::{Element, ElementTypeId}; use dom::node::{AbstractNode, ScriptView}; use js::jsapi::{JSObject, JSContext, JSVal}; @@ -148,7 +148,7 @@ impl HTMLElement { } } -impl CacheableWrapper for HTMLElement { +impl Reflectable for HTMLElement { fn get_wrappercache(&mut self) -> &mut WrapperCache { self.element.get_wrappercache() } @@ -160,7 +160,7 @@ impl CacheableWrapper for HTMLElement { } impl BindingObject for HTMLElement { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.element.GetParentObject(cx) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 804657cf927..164890043b5 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{DOMString, ErrorResult, CacheableWrapper}; +use dom::bindings::utils::{DOMString, ErrorResult, Reflectable}; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; use dom::node::{AbstractNode, ScriptView}; diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index ba38135214f..2bb7d42684a 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{CacheableWrapper, DOMString, ErrorResult}; +use dom::bindings::utils::{Reflectable, DOMString, ErrorResult}; use dom::element::HTMLFormElementTypeId; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index ae98894d012..5fd54975f2d 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{DOMString, ErrorResult, CacheableWrapper}; +use dom::bindings::utils::{DOMString, ErrorResult, Reflectable}; use dom::htmlcollection::HTMLCollection; use dom::htmlelement::HTMLElement; use js::jsapi::{JSObject, JSContext}; diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index 6a455279840..ef5ba195b31 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::MouseEventBinding; use dom::bindings::utils::{ErrorResult, Fallible, DOMString}; -use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; use dom::eventtarget::EventTarget; use dom::uievent::UIEvent; use dom::window::Window; @@ -142,7 +142,7 @@ impl MouseEvent { } } -impl CacheableWrapper for MouseEvent { +impl Reflectable for MouseEvent { fn get_wrappercache(&mut self) -> &mut WrapperCache { return self.parent.get_wrappercache() } @@ -154,7 +154,7 @@ impl CacheableWrapper for MouseEvent { } impl BindingObject for MouseEvent { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } } diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index 144f5a548b5..7cc1c39796a 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, CacheableWrapper}; +use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; use dom::bindings::utils::{DOMString, Fallible}; use dom::bindings::codegen::NavigatorBinding; use script_task::{page_from_context}; @@ -87,7 +87,7 @@ impl Navigator { } } -impl CacheableWrapper for Navigator { +impl Reflectable for Navigator { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -99,10 +99,10 @@ impl CacheableWrapper for Navigator { } impl BindingObject for Navigator { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 155f9c390dd..3fd7b50a751 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -6,7 +6,7 @@ use dom::bindings::node; use dom::bindings::utils::{WrapperCache, DOMString, ErrorResult, Fallible, NotFound, HierarchyRequest}; -use dom::bindings::utils::{BindingObject, CacheableWrapper, null_str_as_empty}; +use dom::bindings::utils::{BindingObject, Reflectable, null_str_as_empty}; use dom::characterdata::CharacterData; use dom::document::AbstractDocument; use dom::element::{Element, ElementTypeId, HTMLImageElementTypeId, HTMLIframeElementTypeId}; @@ -155,11 +155,11 @@ impl TreeNode> for Node { } impl<'self, View> AbstractNode { // Unsafe accessors - pub unsafe fn as_cacheable_wrapper(&self) -> @mut CacheableWrapper { + pub unsafe fn as_cacheable_wrapper(&self) -> @mut Reflectable { match self.type_id() { TextNodeTypeId => { let node: @mut Text = cast::transmute(self.obj); - node as @mut CacheableWrapper + node as @mut Reflectable } _ => { fail!("unsupported node type") @@ -789,7 +789,7 @@ impl VoidPtrLike for AbstractNode { } } -impl CacheableWrapper for Node { +impl Reflectable for Node { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&mut self.wrapper) } } @@ -800,7 +800,7 @@ impl CacheableWrapper for Node { } impl BindingObject for Node { - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { match self.parent_node { Some(node) => Some(unsafe {node.as_cacheable_wrapper()}), None => None diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index 35cf161fbbc..64c74827cc6 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::UIEventBinding; use dom::bindings::utils::{DOMString, Fallible}; -use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; use dom::node::{AbstractNode, ScriptView}; use dom::event::Event; use dom::window::Window; @@ -115,7 +115,7 @@ impl UIEvent { } } -impl CacheableWrapper for UIEvent { +impl Reflectable for UIEvent { fn get_wrappercache(&mut self) -> &mut WrapperCache { return self.parent.get_wrappercache() } @@ -127,7 +127,7 @@ impl CacheableWrapper for UIEvent { } impl BindingObject for UIEvent { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { self.parent.GetParentObject(cx) } } diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index 9bf415d64de..cca4b43b826 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, CacheableWrapper}; +use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; use dom::bindings::codegen::ValidityStateBinding; use js::jsapi::{JSContext, JSObject}; use std::cast; @@ -59,7 +59,7 @@ impl ValidityState { } } -impl CacheableWrapper for ValidityState { +impl Reflectable for ValidityState { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -71,7 +71,7 @@ impl CacheableWrapper for ValidityState { } impl BindingObject for ValidityState { - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { None } } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 5c2bf7cda97..c57a55d6057 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::WindowBinding; use dom::bindings::utils::{WrapperCache, DOMString, Traceable}; -use dom::bindings::utils::{CacheableWrapper, BindingObject, null_str_as_empty}; +use dom::bindings::utils::{Reflectable, BindingObject, null_str_as_empty}; use dom::document::AbstractDocument; use dom::node::{AbstractNode, ScriptView}; use dom::navigator::Navigator; @@ -135,7 +135,7 @@ impl Window { } } -impl CacheableWrapper for Window { +impl Reflectable for Window { fn get_wrappercache(&mut self) -> &mut WrapperCache { unsafe { cast::transmute(&self.wrapper) } } @@ -147,7 +147,7 @@ impl CacheableWrapper for Window { } impl BindingObject for Window { - fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> { None } } diff --git a/src/components/script/dom/windowproxy.rs b/src/components/script/dom/windowproxy.rs index e9de57ca182..7f8adc0419b 100644 --- a/src/components/script/dom/windowproxy.rs +++ b/src/components/script/dom/windowproxy.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject}; +use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject}; use script_task::page_from_context; use js::jsapi::{JSContext, JSObject}; @@ -24,15 +24,15 @@ impl WindowProxy { } impl BindingObject for WindowProxy { - fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> { + fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { let page = page_from_context(cx); unsafe { - Some((*page).frame.get_ref().window as @mut CacheableWrapper) + Some((*page).frame.get_ref().window as @mut Reflectable) } } } -impl CacheableWrapper for WindowProxy { +impl Reflectable for WindowProxy { fn get_wrappercache(&mut self) -> &mut WrapperCache { return self.get_wrappercache() } diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index cf711c1fc68..1242b2732e1 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -8,7 +8,7 @@ use servo_msg::compositor_msg::{ScriptListener, Loading, PerformingLayout}; use servo_msg::compositor_msg::FinishedLoading; use dom::bindings::codegen::RegisterBindings; -use dom::bindings::utils::{CacheableWrapper, GlobalStaticData}; +use dom::bindings::utils::{Reflectable, GlobalStaticData}; use dom::document::AbstractDocument; use dom::element::Element; use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, MouseUpEvent}; From 2cbe2d7ce914d2bb371c62aff19c08a0b522661b Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 8 Oct 2013 20:31:24 +0200 Subject: [PATCH 2/8] Rename WrapperCache to Reflector. I think the abstraction from the raw JSObject is still probably worthwhile for now. --- src/components/script/dom/bindings/domparser.rs | 4 ++-- src/components/script/dom/bindings/element.rs | 8 ++++---- src/components/script/dom/bindings/node.rs | 4 ++-- src/components/script/dom/bindings/utils.rs | 10 +++++----- src/components/script/dom/blob.rs | 8 ++++---- src/components/script/dom/characterdata.rs | 4 ++-- src/components/script/dom/clientrect.rs | 8 ++++---- src/components/script/dom/clientrectlist.rs | 8 ++++---- src/components/script/dom/document.rs | 10 +++++----- src/components/script/dom/domparser.rs | 6 +++--- src/components/script/dom/element.rs | 4 ++-- src/components/script/dom/event.rs | 8 ++++---- src/components/script/dom/eventtarget.rs | 8 ++++---- src/components/script/dom/formdata.rs | 8 ++++---- src/components/script/dom/htmlcollection.rs | 8 ++++---- src/components/script/dom/htmldocument.rs | 4 ++-- src/components/script/dom/htmlelement.rs | 4 ++-- src/components/script/dom/mouseevent.rs | 4 ++-- src/components/script/dom/navigator.rs | 8 ++++---- src/components/script/dom/node.rs | 8 ++++---- src/components/script/dom/uievent.rs | 4 ++-- src/components/script/dom/validitystate.rs | 8 ++++---- src/components/script/dom/window.rs | 8 ++++---- src/components/script/dom/windowproxy.rs | 8 ++++---- 24 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/components/script/dom/bindings/domparser.rs b/src/components/script/dom/bindings/domparser.rs index 12b12c524b0..98d745d8cc8 100644 --- a/src/components/script/dom/bindings/domparser.rs +++ b/src/components/script/dom/bindings/domparser.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DOMParserBinding; -use dom::bindings::utils::{Reflectable, WrapperCache}; +use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{BindingObject, DerivedWrapper}; use dom::domparser::DOMParser; @@ -13,7 +13,7 @@ use js::glue::{RUST_OBJECT_TO_JSVAL}; use std::cast; impl Reflectable for DOMParser { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 4dd4495756a..abe2ff946b9 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -4,7 +4,7 @@ use dom::types::*; use dom::bindings::codegen::*; -use dom::bindings::utils::{BindingObject, WrapperCache, Reflectable, Traceable}; +use dom::bindings::utils::{BindingObject, Reflector, Reflectable, Traceable}; use dom::node::ScriptView; use js::jsapi::{JSContext, JSObject, JSTracer}; @@ -12,7 +12,7 @@ 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 WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.element.get_wrappercache() } @@ -27,7 +27,7 @@ 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 WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.htmlelement.get_wrappercache() } @@ -42,7 +42,7 @@ 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 WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.node.get_wrappercache() } diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 94f1dccfbd8..e14d7c46036 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{Reflectable, WrapperCache, Traceable}; +use dom::bindings::utils::{Reflectable, Reflector, Traceable}; use dom::element::*; use dom::types::*; use dom::node::{AbstractNode, ElementNodeTypeId, TextNodeTypeId, CommentNodeTypeId}; @@ -96,7 +96,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> *JSObject } impl Reflectable for AbstractNode { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { do self.with_mut_base |base| { unsafe { cast::transmute(&base.wrapper) diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index ef1cb11bee3..4270eef0a6f 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -528,15 +528,15 @@ pub fn initialize_global(global: *JSObject) { } pub trait Reflectable { - fn get_wrappercache(&mut self) -> &mut WrapperCache; + fn get_wrappercache(&mut self) -> &mut Reflector; fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject; } -pub struct WrapperCache { +pub struct Reflector { wrapper: *JSObject } -impl WrapperCache { +impl Reflector { pub fn get_wrapper(&self) -> *JSObject { unsafe { cast::transmute(self.wrapper) } } @@ -549,8 +549,8 @@ impl WrapperCache { return to_unsafe_ptr(&self.wrapper); } - pub fn new() -> WrapperCache { - WrapperCache { + pub fn new() -> Reflector { + Reflector { wrapper: ptr::null() } } diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index 6849f75f490..807a144635e 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; +use dom::bindings::utils::{Reflector, BindingObject, Reflectable}; use dom::bindings::codegen::BlobBinding; use script_task::{page_from_context}; @@ -11,19 +11,19 @@ use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct Blob { - wrapper: WrapperCache + wrapper: Reflector } impl Blob { pub fn new() -> @mut Blob { @mut Blob { - wrapper: WrapperCache::new() + wrapper: Reflector::new() } } } impl Reflectable for Blob { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 20e9fc7b46a..67e298beede 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -5,7 +5,7 @@ //! DOM bindings for `CharacterData`. use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; -use dom::bindings::utils::{BindingObject, Reflectable, WrapperCache}; +use dom::bindings::utils::{BindingObject, Reflectable, Reflector}; use dom::node::{Node, NodeTypeId, ScriptView}; use js::jsapi::{JSObject, JSContext}; @@ -58,7 +58,7 @@ impl CharacterData { } impl Reflectable for CharacterData { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.node.get_wrappercache() } diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index 1adada978aa..316bd900dc3 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, Reflector, BindingObject, DerivedWrapper}; use dom::bindings::codegen::ClientRectBinding; use script_task::page_from_context; @@ -12,7 +12,7 @@ use js::glue::RUST_OBJECT_TO_JSVAL; use std::cast; pub struct ClientRect { - wrapper: WrapperCache, + wrapper: Reflector, top: f32, bottom: f32, left: f32, @@ -26,7 +26,7 @@ impl ClientRect { bottom: bottom, left: left, right: right, - wrapper: WrapperCache::new() + wrapper: Reflector::new() }; rect.init_wrapper(cx, scope); rect @@ -62,7 +62,7 @@ impl ClientRect { } impl Reflectable for ClientRect { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 2b6cd819ada..e5e7c8a9238 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::ClientRectListBinding; -use dom::bindings::utils::{WrapperCache, Reflectable, BindingObject}; +use dom::bindings::utils::{Reflector, Reflectable, BindingObject}; use dom::clientrect::ClientRect; use script_task::page_from_context; @@ -12,14 +12,14 @@ use js::jsapi::{JSObject, JSContext}; use std::cast; pub struct ClientRectList { - wrapper: WrapperCache, + wrapper: Reflector, rects: ~[@mut ClientRect] } impl ClientRectList { pub fn new(rects: ~[@mut ClientRect], cx: *JSContext, scope: *JSObject) -> @mut ClientRectList { let list = @mut ClientRectList { - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), rects: rects }; list.init_wrapper(cx, scope); @@ -49,7 +49,7 @@ impl ClientRectList { } impl Reflectable for ClientRectList { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 ce5f4fbc35f..1b1558e4657 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::DocumentBinding; -use dom::bindings::utils::{DOMString, WrapperCache, ErrorResult, Fallible}; +use dom::bindings::utils::{DOMString, Reflector, ErrorResult, Fallible}; use dom::bindings::utils::{BindingObject, Reflectable, DerivedWrapper}; use dom::bindings::utils::{is_valid_element_name, InvalidCharacter, Traceable, null_str_as_empty}; use dom::element::{Element}; @@ -92,7 +92,7 @@ pub enum DocumentType { pub struct Document { root: Option>, - wrapper: WrapperCache, + wrapper: Reflector, window: Option<@mut Window>, doctype: DocumentType, title: ~str @@ -103,7 +103,7 @@ impl Document { pub fn new(window: Option<@mut Window>, doctype: DocumentType) -> Document { Document { root: None, - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), window: window, doctype: doctype, title: ~"" @@ -132,7 +132,7 @@ impl WrappableDocument for Document { } impl Reflectable for AbstractDocument { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { do self.with_mut_base |doc| { doc.get_wrappercache() } @@ -175,7 +175,7 @@ impl DerivedWrapper for AbstractDocument { impl Reflectable for Document { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index 31aa0e2a850..d006bf55fee 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::DOMParserBinding; use dom::bindings::codegen::DOMParserBinding::SupportedTypeValues::{Text_html, Text_xml}; -use dom::bindings::utils::{DOMString, Fallible, WrapperCache, Reflectable}; +use dom::bindings::utils::{DOMString, Fallible, Reflector, Reflectable}; use dom::document::{AbstractDocument, Document, XML}; use dom::element::HTMLHtmlElementTypeId; use dom::htmldocument::HTMLDocument; @@ -15,14 +15,14 @@ use dom::window::Window; pub struct DOMParser { owner: @mut Window, //XXXjdm Document instead? - wrapper: WrapperCache + wrapper: Reflector } impl DOMParser { pub fn new(owner: @mut Window) -> @mut DOMParser { let parser = @mut DOMParser { owner: owner, - wrapper: WrapperCache::new() + wrapper: Reflector::new() }; // TODO(tkuehn): This just handles the top-level page. Need to handle subframes. diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 553398d1e6c..b10c2ccdc31 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -4,7 +4,7 @@ //! Element nodes. -use dom::bindings::utils::{BindingObject, Reflectable, DOMString, ErrorResult, Fallible, WrapperCache}; +use dom::bindings::utils::{BindingObject, Reflectable, DOMString, ErrorResult, Fallible, Reflector}; use dom::bindings::utils::{null_str_as_empty, null_str_as_empty_ref}; use dom::htmlcollection::HTMLCollection; use dom::clientrect::ClientRect; @@ -29,7 +29,7 @@ pub struct Element { } impl Reflectable for Element { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.node.get_wrappercache() } diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 3928c84067c..1c9583ed1fb 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -6,7 +6,7 @@ use dom::eventtarget::EventTarget; use dom::window::Window; use dom::bindings::codegen::EventBinding; use dom::bindings::utils::{Reflectable, BindingObject, DerivedWrapper}; -use dom::bindings::utils::{DOMString, ErrorResult, Fallible, WrapperCache}; +use dom::bindings::utils::{DOMString, ErrorResult, Fallible, Reflector}; use geom::point::Point2D; use js::glue::RUST_OBJECT_TO_JSVAL; @@ -26,7 +26,7 @@ pub enum Event_ { } pub struct Event { - wrapper: WrapperCache, + wrapper: Reflector, type_: DOMString, default_prevented: bool, cancelable: bool, @@ -37,7 +37,7 @@ pub struct Event { impl Event { pub fn new(type_: &DOMString) -> Event { Event { - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), type_: (*type_).clone(), default_prevented: false, cancelable: true, @@ -114,7 +114,7 @@ impl Event { } impl Reflectable for Event { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 dc60979e551..eb417e513a0 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::EventTargetBinding; -use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, Reflector, BindingObject, DerivedWrapper}; use script_task::page_from_context; use js::glue::RUST_OBJECT_TO_JSVAL; @@ -12,13 +12,13 @@ use js::jsapi::{JSObject, JSContext, JSVal}; use std::cast; pub struct EventTarget { - wrapper: WrapperCache + wrapper: Reflector } impl EventTarget { pub fn new() -> ~EventTarget { ~EventTarget { - wrapper: WrapperCache::new() + wrapper: Reflector::new() } } @@ -28,7 +28,7 @@ impl EventTarget { } impl Reflectable for EventTarget { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 b86f43f0fd5..1a6bacc2871 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::utils::{Reflectable, BindingObject, DerivedWrapper}; -use dom::bindings::utils::{WrapperCache, DOMString, null_str_as_empty}; +use dom::bindings::utils::{Reflector, DOMString, null_str_as_empty}; use dom::bindings::codegen::FormDataBinding; use dom::blob::Blob; use script_task::{page_from_context}; @@ -21,14 +21,14 @@ enum FormDatum { pub struct FormData { data: HashMap<~str, FormDatum>, - wrapper: WrapperCache + wrapper: Reflector } impl FormData { pub fn new() -> @mut FormData { @mut FormData { data: HashMap::new(), - wrapper: WrapperCache::new() + wrapper: Reflector::new() } } @@ -50,7 +50,7 @@ impl FormData { } impl Reflectable for FormData { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 bcc68145010..c58d9d15b59 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::HTMLCollectionBinding; -use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, Reflector}; use dom::bindings::utils::{DOMString, Fallible}; use dom::node::{AbstractNode, ScriptView}; use script_task::page_from_context; @@ -15,14 +15,14 @@ use std::ptr; pub struct HTMLCollection { elements: ~[AbstractNode], - wrapper: WrapperCache + wrapper: Reflector } impl HTMLCollection { pub fn new(elements: ~[AbstractNode], cx: *JSContext, scope: *JSObject) -> @mut HTMLCollection { let collection = @mut HTMLCollection { elements: elements, - wrapper: WrapperCache::new() + wrapper: Reflector::new() }; collection.init_wrapper(cx, scope); collection @@ -69,7 +69,7 @@ impl BindingObject for HTMLCollection { } impl Reflectable for HTMLCollection { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index a7feb52b5fa..7d5ff34f4b8 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLDocumentBinding; use dom::bindings::utils::{DOMString, ErrorResult, Fallible, Traceable}; -use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, Reflector}; use dom::document::{AbstractDocument, Document, WrappableDocument, HTML}; use dom::element::HTMLHeadElementTypeId; use dom::htmlcollection::HTMLCollection; @@ -201,7 +201,7 @@ impl HTMLDocument { } impl Reflectable for HTMLDocument { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.parent.get_wrappercache() } diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index 79c79c3605e..64092156a78 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::HTMLElementBinding; use dom::bindings::utils::{DOMString, ErrorResult, Fallible}; -use dom::bindings::utils::{Reflectable, BindingObject, WrapperCache}; +use dom::bindings::utils::{Reflectable, BindingObject, Reflector}; use dom::element::{Element, ElementTypeId}; use dom::node::{AbstractNode, ScriptView}; use js::jsapi::{JSObject, JSContext, JSVal}; @@ -149,7 +149,7 @@ impl HTMLElement { } impl Reflectable for HTMLElement { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { self.element.get_wrappercache() } diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index ef5ba195b31..b010233af1d 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::MouseEventBinding; use dom::bindings::utils::{ErrorResult, Fallible, DOMString}; -use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, Reflector, BindingObject, DerivedWrapper}; use dom::eventtarget::EventTarget; use dom::uievent::UIEvent; use dom::window::Window; @@ -143,7 +143,7 @@ impl MouseEvent { } impl Reflectable for MouseEvent { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { return self.parent.get_wrappercache() } diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index 7cc1c39796a..c7779a6911f 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; +use dom::bindings::utils::{Reflector, BindingObject, Reflectable}; use dom::bindings::utils::{DOMString, Fallible}; use dom::bindings::codegen::NavigatorBinding; use script_task::{page_from_context}; @@ -12,13 +12,13 @@ use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct Navigator { - wrapper: WrapperCache + wrapper: Reflector } impl Navigator { pub fn new() -> @mut Navigator { @mut Navigator { - wrapper: WrapperCache::new() + wrapper: Reflector::new() } } @@ -88,7 +88,7 @@ impl Navigator { } impl Reflectable for Navigator { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 3fd7b50a751..d4e5bebce01 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -5,7 +5,7 @@ //! The core DOM types. Defines the basic DOM hierarchy as well as all the HTML elements. use dom::bindings::node; -use dom::bindings::utils::{WrapperCache, DOMString, ErrorResult, Fallible, NotFound, HierarchyRequest}; +use dom::bindings::utils::{Reflector, DOMString, ErrorResult, Fallible, NotFound, HierarchyRequest}; use dom::bindings::utils::{BindingObject, Reflectable, null_str_as_empty}; use dom::characterdata::CharacterData; use dom::document::AbstractDocument; @@ -63,7 +63,7 @@ pub struct AbstractNodeChildrenIterator { /// `LayoutData`. pub struct Node { /// The JavaScript wrapper for this node. - wrapper: WrapperCache, + wrapper: Reflector, /// The type of node that this is. type_id: NodeTypeId, @@ -465,7 +465,7 @@ impl Node { pub fn new(type_id: NodeTypeId) -> Node { Node { - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), type_id: type_id, abstract: None, @@ -790,7 +790,7 @@ impl VoidPtrLike for AbstractNode { } impl Reflectable for Node { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 64c74827cc6..a21a2192ffe 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::UIEventBinding; use dom::bindings::utils::{DOMString, Fallible}; -use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject, DerivedWrapper}; +use dom::bindings::utils::{Reflectable, Reflector, BindingObject, DerivedWrapper}; use dom::node::{AbstractNode, ScriptView}; use dom::event::Event; use dom::window::Window; @@ -116,7 +116,7 @@ impl UIEvent { } impl Reflectable for UIEvent { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { return self.parent.get_wrappercache() } diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index cca4b43b826..25bb25d91e6 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{WrapperCache, BindingObject, Reflectable}; +use dom::bindings::utils::{Reflector, BindingObject, Reflectable}; use dom::bindings::codegen::ValidityStateBinding; use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct ValidityState { - wrapper: WrapperCache, + wrapper: Reflector, state: u8 } impl ValidityState { pub fn valid() -> ValidityState { ValidityState { - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), state: 0 } } @@ -60,7 +60,7 @@ impl ValidityState { } impl Reflectable for ValidityState { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&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 c57a55d6057..cf98ed190df 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::codegen::WindowBinding; -use dom::bindings::utils::{WrapperCache, DOMString, Traceable}; +use dom::bindings::utils::{Reflector, DOMString, Traceable}; use dom::bindings::utils::{Reflectable, BindingObject, null_str_as_empty}; use dom::document::AbstractDocument; use dom::node::{AbstractNode, ScriptView}; @@ -43,7 +43,7 @@ pub struct Window { page: @mut Page, script_chan: ScriptChan, compositor: @ScriptListener, - wrapper: WrapperCache, + wrapper: Reflector, timer_chan: SharedChan, navigator: Option<@mut Navigator>, image_cache_task: ImageCacheTask, @@ -136,7 +136,7 @@ impl Window { } impl Reflectable for Window { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { unsafe { cast::transmute(&self.wrapper) } } @@ -203,7 +203,7 @@ impl Window { page: page, script_chan: script_chan.clone(), compositor: compositor, - wrapper: WrapperCache::new(), + wrapper: Reflector::new(), timer_chan: { let (timer_port, timer_chan) = comm::stream::(); let id = page.id.clone(); diff --git a/src/components/script/dom/windowproxy.rs b/src/components/script/dom/windowproxy.rs index 7f8adc0419b..97f82a87403 100644 --- a/src/components/script/dom/windowproxy.rs +++ b/src/components/script/dom/windowproxy.rs @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::utils::{Reflectable, WrapperCache, BindingObject}; +use dom::bindings::utils::{Reflectable, Reflector, BindingObject}; use script_task::page_from_context; use js::jsapi::{JSContext, JSObject}; pub struct WindowProxy { - wrapper: WrapperCache + wrapper: Reflector } impl WindowProxy { pub fn new() -> @mut WindowProxy { @mut WindowProxy { - wrapper: WrapperCache::new() + wrapper: Reflector::new() } } @@ -33,7 +33,7 @@ impl BindingObject for WindowProxy { } impl Reflectable for WindowProxy { - fn get_wrappercache(&mut self) -> &mut WrapperCache { + fn get_wrappercache(&mut self) -> &mut Reflector { return self.get_wrappercache() } From 62ddac8b6f939c8f38ceba71888f4785f29b2dbf Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 8 Oct 2013 20:36:56 +0200 Subject: [PATCH 3/8] Rename get_wrappercache() to reflector(). v1 I also updated some variable names in the codegen. --- .../script/dom/bindings/codegen/CodegenRust.py | 12 ++++++------ src/components/script/dom/bindings/domparser.rs | 2 +- src/components/script/dom/bindings/element.rs | 12 ++++++------ src/components/script/dom/bindings/node.rs | 4 ++-- src/components/script/dom/bindings/utils.rs | 8 ++++---- src/components/script/dom/blob.rs | 2 +- src/components/script/dom/characterdata.rs | 4 ++-- src/components/script/dom/clientrect.rs | 2 +- src/components/script/dom/clientrectlist.rs | 2 +- src/components/script/dom/document.rs | 10 +++++----- src/components/script/dom/domparser.rs | 2 +- src/components/script/dom/element.rs | 10 +++++----- src/components/script/dom/event.rs | 2 +- src/components/script/dom/eventtarget.rs | 2 +- src/components/script/dom/formdata.rs | 2 +- src/components/script/dom/htmlcollection.rs | 2 +- src/components/script/dom/htmldatalistelement.rs | 2 +- src/components/script/dom/htmldocument.rs | 6 +++--- src/components/script/dom/htmlelement.rs | 4 ++-- src/components/script/dom/htmlfieldsetelement.rs | 2 +- src/components/script/dom/htmlformelement.rs | 2 +- src/components/script/dom/htmlmapelement.rs | 2 +- src/components/script/dom/mouseevent.rs | 4 ++-- src/components/script/dom/navigator.rs | 2 +- src/components/script/dom/node.rs | 2 +- src/components/script/dom/uievent.rs | 4 ++-- src/components/script/dom/validitystate.rs | 2 +- src/components/script/dom/window.rs | 4 ++-- src/components/script/dom/windowproxy.rs | 4 ++-- src/components/script/script_task.rs | 2 +- 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) -> *JSObject } impl Reflectable for AbstractNode { - 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 { } 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 { #[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 { } impl Reflectable for Node { - 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); From 6bf740d967118dbbee5ae1a83e05086ee29344fd Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 8 Oct 2013 20:40:45 +0200 Subject: [PATCH 4/8] Rename {get,set}_wrapper to {get,set}_jsobject. v1 --- .../script/dom/bindings/codegen/CodegenRust.py | 6 +++--- src/components/script/dom/bindings/node.rs | 4 ++-- src/components/script/dom/bindings/utils.rs | 14 +++++++------- src/components/script/dom/document.rs | 4 ++-- src/components/script/dom/domparser.rs | 2 +- src/components/script/dom/element.rs | 6 +++--- src/components/script/dom/htmldatalistelement.rs | 2 +- src/components/script/dom/htmldocument.rs | 2 +- src/components/script/dom/htmlfieldsetelement.rs | 2 +- src/components/script/dom/htmlformelement.rs | 2 +- src/components/script/dom/htmlmapelement.rs | 2 +- src/components/script/script_task.rs | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 5455ca8d4bb..bb2a779dd04 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2525,7 +2525,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod): //NS_ADDREF(aObject); - (*reflector).set_wrapper(obj); + (*reflector).set_jsobject(obj); return obj;""" % (CreateBindingJSObject(self.descriptor, "parent")) else: @@ -2533,7 +2533,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod): %s let proto = GetProtoObject(aCx, obj, obj); JS_SetPrototype(aCx, obj, proto); - (*reflector).set_wrapper(obj); + (*reflector).set_jsobject(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.reflector().get_wrapper(); + let obj = global.reflector().get_jsobject(); """ preArgs = ["global"] diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 4e2297fd229..59a1633c27b 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -119,7 +119,7 @@ impl Traceable for Node { debug!("tracing %s", name); let mut node = node.unwrap(); let cache = node.reflector(); - let wrapper = cache.get_wrapper(); + let wrapper = cache.get_jsobject(); assert!(wrapper.is_not_null()); unsafe { (*tracer).debugPrinter = ptr::null(); @@ -130,7 +130,7 @@ impl Traceable for Node { } } } - debug!("tracing %p?:", self.wrapper.get_wrapper()); + debug!("tracing %p?:", self.wrapper.get_jsobject()); trace_node(tracer, self.parent_node, "parent"); trace_node(tracer, self.first_child, "first child"); trace_node(tracer, self.last_child, "last child"); diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index e59c007df96..b03fc5f89c3 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -537,11 +537,11 @@ pub struct Reflector { } impl Reflector { - pub fn get_wrapper(&self) -> *JSObject { + pub fn get_jsobject(&self) -> *JSObject { unsafe { cast::transmute(self.wrapper) } } - pub fn set_wrapper(&mut self, wrapper: *JSObject) { + pub fn set_jsobject(&mut self, wrapper: *JSObject) { self.wrapper = wrapper; } @@ -562,7 +562,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, vp: *mut JSVal) -> JSBool { unsafe { let cache = value.reflector(); - let obj = cache.get_wrapper(); + let obj = cache.get_jsobject(); if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { *vp = RUST_OBJECT_TO_JSVAL(obj); return 1; // JS_TRUE @@ -574,7 +574,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, } // MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx)); - cache.set_wrapper(obj); + cache.set_jsobject(obj); *vp = RUST_OBJECT_TO_JSVAL(obj); return JS_WrapValue(cx, cast::transmute(vp)); } @@ -585,12 +585,12 @@ pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Ref match p { Some(ref mut p) => { let cache = p.reflector(); - let wrapper = cache.get_wrapper(); + let wrapper = cache.get_jsobject(); if wrapper.is_not_null() { return wrapper; } let wrapper = p.wrap_object_shared(cx, scope); - cache.set_wrapper(wrapper); + cache.set_jsobject(wrapper); wrapper } None => unsafe { JS_GetGlobalObject(cx) } @@ -735,7 +735,7 @@ impl DerivedWrapper for AbstractNode { #[fixed_stack_segment] fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { let cache = self.reflector(); - let wrapper = cache.get_wrapper(); + let wrapper = cache.get_jsobject(); if wrapper.is_not_null() { unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; return 1; diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 27bcd8f28b4..00aacc5fcfe 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -163,7 +163,7 @@ impl DerivedWrapper for AbstractDocument { #[fixed_stack_segment] fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { let cache = self.reflector(); - let wrapper = cache.get_wrapper(); + let wrapper = cache.get_jsobject(); unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; return 1; } @@ -230,7 +230,7 @@ impl Document { let win = self.window.get_ref(); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index d4b56af504c..ca80a958caf 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -28,7 +28,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.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); parser.wrap_object_shared(cx, scope); parser } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 86c429e55ec..9f653fa4e59 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -192,7 +192,7 @@ impl<'self> Element { let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } } @@ -288,7 +288,7 @@ impl Element { ContentBoxesResponse(rects) => { let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); let rects = do rects.map |r| { ClientRect::new( r.origin.y.to_f32(), @@ -316,7 +316,7 @@ impl Element { ContentBoxResponse(rect) => { let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); ClientRect::new( rect.origin.y.to_f32(), (rect.origin.y + rect.size.height).to_f32(), diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index b782403f13b..65d84684959 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -18,7 +18,7 @@ impl HTMLDataListElement { let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index 66f813dc9af..a023e01e863 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -37,7 +37,7 @@ impl HTMLDocument { let win = self.parent.window.get_ref(); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 285c6371f69..57fc276d6b0 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -44,7 +44,7 @@ impl HTMLFieldSetElement { let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index 52ed2c44ac3..c6db43401a7 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -20,7 +20,7 @@ impl HTMLFormElement { let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index 203008ccd7b..a01d2bf45c6 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -25,7 +25,7 @@ impl HTMLMapElement { let win = doc.with_base(|doc| doc.window.unwrap()); let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cache = win.reflector(); - let scope = cache.get_wrapper(); + let scope = cache.get_jsobject(); (scope, cx) } diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 9c3d240de27..69509d3a648 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.reflector().get_wrapper()); + page.initialize_js_info(cx, window.reflector().get_jsobject()); RegisterBindings::Register(page.js_info.get_ref().js_compartment); From 622aa76515854f76d81635f312f6d989d369b4e1 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 8 Oct 2013 20:44:42 +0200 Subject: [PATCH 5/8] Rename WrappableDocument stuff. --- src/components/script/dom/document.rs | 12 ++++++------ src/components/script/dom/htmldocument.rs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 00aacc5fcfe..c9dbace1c4b 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -31,8 +31,8 @@ use std::libc; use std::ascii::StrAsciiExt; use std::unstable::raw::Box; -pub trait WrappableDocument { - fn init_wrapper(@mut self, cx: *JSContext); +pub trait ReflectableDocument { + fn init_reflector(@mut self, cx: *JSContext); } #[deriving(Eq)] @@ -41,8 +41,8 @@ pub struct AbstractDocument { } impl AbstractDocument { - pub fn as_abstract(cx: *JSContext, doc: @mut T) -> AbstractDocument { - doc.init_wrapper(cx); + pub fn as_abstract(cx: *JSContext, doc: @mut T) -> AbstractDocument { + doc.init_reflector(cx); AbstractDocument { document: unsafe { cast::transmute(doc) } } @@ -125,8 +125,8 @@ impl Document { } } -impl WrappableDocument for Document { - fn init_wrapper(@mut self, cx: *JSContext) { +impl ReflectableDocument for Document { + fn init_reflector(@mut self, cx: *JSContext) { self.wrap_object_shared(cx, ptr::null()); //XXXjdm a proper scope would be nice } } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index a023e01e863..4e9732499fb 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -5,7 +5,7 @@ use dom::bindings::codegen::HTMLDocumentBinding; use dom::bindings::utils::{DOMString, ErrorResult, Fallible, Traceable}; use dom::bindings::utils::{Reflectable, BindingObject, Reflector}; -use dom::document::{AbstractDocument, Document, WrappableDocument, HTML}; +use dom::document::{AbstractDocument, Document, ReflectableDocument, HTML}; use dom::element::HTMLHeadElementTypeId; use dom::htmlcollection::HTMLCollection; use dom::node::{AbstractNode, ScriptView, ElementNodeTypeId}; @@ -42,8 +42,8 @@ impl HTMLDocument { } } -impl WrappableDocument for HTMLDocument { - fn init_wrapper(@mut self, cx: *JSContext) { +impl ReflectableDocument for HTMLDocument { + fn init_reflector(@mut self, cx: *JSContext) { self.wrap_object_shared(cx, ptr::null()); //XXXjdm a proper scope would be nice } } From 549ac6a29b3707451b1f48d30a80d06ac31ccf27 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 9 Oct 2013 09:53:23 +0200 Subject: [PATCH 6/8] Rename some local variables and shorten some lines. This was done manually, and might benefit from a more careful review. --- src/components/script/dom/bindings/node.rs | 7 +++---- src/components/script/dom/bindings/utils.rs | 19 +++++++++---------- src/components/script/dom/document.rs | 8 ++------ src/components/script/dom/domparser.rs | 3 +-- src/components/script/dom/element.rs | 9 +++------ .../script/dom/htmldatalistelement.rs | 3 +-- src/components/script/dom/htmldocument.rs | 3 +-- .../script/dom/htmlfieldsetelement.rs | 3 +-- src/components/script/dom/htmlformelement.rs | 3 +-- src/components/script/dom/htmlmapelement.rs | 3 +-- src/components/script/dom/window.rs | 4 ++-- 11 files changed, 25 insertions(+), 40 deletions(-) diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs index 59a1633c27b..696f0adbc90 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -118,15 +118,14 @@ impl Traceable for Node { } debug!("tracing %s", name); let mut node = node.unwrap(); - let cache = node.reflector(); - let wrapper = cache.get_jsobject(); - assert!(wrapper.is_not_null()); + let obj = node.reflector().get_jsobject(); + assert!(obj.is_not_null()); unsafe { (*tracer).debugPrinter = ptr::null(); (*tracer).debugPrintIndex = -1; do name.to_c_str().with_ref |name| { (*tracer).debugPrintArg = name as *libc::c_void; - JS_CallTracer(cast::transmute(tracer), wrapper, JSTRACE_OBJECT as u32); + JS_CallTracer(cast::transmute(tracer), obj, JSTRACE_OBJECT as u32); } } } diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index b03fc5f89c3..56b28298a07 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -561,8 +561,8 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, value: @mut Reflectable, vp: *mut JSVal) -> JSBool { unsafe { - let cache = value.reflector(); - let obj = cache.get_jsobject(); + let reflector = value.reflector(); + let obj = reflector.get_jsobject(); if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { *vp = RUST_OBJECT_TO_JSVAL(obj); return 1; // JS_TRUE @@ -574,7 +574,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject, } // MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx)); - cache.set_jsobject(obj); + reflector.set_jsobject(obj); *vp = RUST_OBJECT_TO_JSVAL(obj); return JS_WrapValue(cx, cast::transmute(vp)); } @@ -584,14 +584,13 @@ 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.reflector(); - let wrapper = cache.get_jsobject(); - if wrapper.is_not_null() { - return wrapper; + let obj = p.reflector().get_jsobject(); + if obj.is_not_null() { + return obj; } - let wrapper = p.wrap_object_shared(cx, scope); - cache.set_jsobject(wrapper); - wrapper + let obj = p.wrap_object_shared(cx, scope); + p.reflector().set_jsobject(obj); + obj } None => unsafe { JS_GetGlobalObject(cx) } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index c9dbace1c4b..ad197804348 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -162,9 +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.reflector(); - let wrapper = cache.get_jsobject(); - unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) }; + unsafe { *vp = RUST_OBJECT_TO_JSVAL(self.reflector().get_jsobject()) }; return 1; } @@ -229,9 +227,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.reflector(); - let scope = cache.get_jsobject(); - (scope, cx) + (win.reflector().get_jsobject(), cx) } pub fn GetElementsByTagName(&self, tag: &DOMString) -> @mut HTMLCollection { diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index ca80a958caf..15d1d7bcae3 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -27,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = owner.reflector().get_jsobject(); parser.wrap_object_shared(cx, scope); parser } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 9f653fa4e59..deb99f1fd26 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -191,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } } @@ -287,8 +286,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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); let rects = do rects.map |r| { ClientRect::new( r.origin.y.to_f32(), @@ -315,8 +313,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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); ClientRect::new( rect.origin.y.to_f32(), (rect.origin.y + rect.size.height).to_f32(), diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index 65d84684959..b24f2712adb 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -17,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs index 4e9732499fb..d8ed4e28621 100644 --- a/src/components/script/dom/htmldocument.rs +++ b/src/components/script/dom/htmldocument.rs @@ -36,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 57fc276d6b0..84b5a1166a1 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -43,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index c6db43401a7..9f08b77ac59 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -19,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index a01d2bf45c6..9e33141d205 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -24,8 +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.reflector(); - let scope = cache.get_jsobject(); + let scope = win.reflector().get_jsobject(); (scope, cx) } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 476263cf4b0..7bfbfa78391 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -225,9 +225,9 @@ impl Window { }; unsafe { - let cache = ptr::to_unsafe_ptr(win.reflector()); + let reflector = ptr::to_unsafe_ptr(win.reflector()); win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope - let global = (*cache).wrapper; + let global = (*reflector).wrapper; do "window".to_c_str().with_ref |name| { JS_DefineProperty(cx, global, name, RUST_OBJECT_TO_JSVAL(global), From 92e91c58da3aee58c40e45903eee9e3fa8573e3f Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 9 Oct 2013 10:38:59 +0200 Subject: [PATCH 7/8] Rename the |wrapper| field in Reflector. --- src/components/script/dom/bindings/utils.rs | 12 ++++++------ src/components/script/dom/document.rs | 2 +- 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); } } From 5ed8b9e83f960918d3f5f76efbf2706689c4160e Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Wed, 9 Oct 2013 12:01:12 +0200 Subject: [PATCH 8/8] Rename |wrapper| to |reflector_| in Reflectable implementations for DOM objects. --- src/components/script/dom/bindings/domparser.rs | 2 +- src/components/script/dom/bindings/node.rs | 4 ++-- src/components/script/dom/blob.rs | 6 +++--- src/components/script/dom/clientrect.rs | 6 +++--- src/components/script/dom/clientrectlist.rs | 6 +++--- src/components/script/dom/document.rs | 8 ++++---- src/components/script/dom/domparser.rs | 4 ++-- src/components/script/dom/event.rs | 6 +++--- src/components/script/dom/eventtarget.rs | 6 +++--- src/components/script/dom/formdata.rs | 6 +++--- src/components/script/dom/htmlcollection.rs | 6 +++--- src/components/script/dom/navigator.rs | 6 +++--- src/components/script/dom/node.rs | 8 ++++---- src/components/script/dom/validitystate.rs | 6 +++--- src/components/script/dom/window.rs | 8 ++++---- src/components/script/dom/windowproxy.rs | 4 ++-- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/components/script/dom/bindings/domparser.rs b/src/components/script/dom/bindings/domparser.rs index 32ab990aa27..14b1f776fc9 100644 --- a/src/components/script/dom/bindings/domparser.rs +++ b/src/components/script/dom/bindings/domparser.rs @@ -14,7 +14,7 @@ use std::cast; impl Reflectable for DOMParser { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.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 696f0adbc90..db0d574e766 100644 --- a/src/components/script/dom/bindings/node.rs +++ b/src/components/script/dom/bindings/node.rs @@ -99,7 +99,7 @@ impl Reflectable for AbstractNode { fn reflector(&mut self) -> &mut Reflector { do self.with_mut_base |base| { unsafe { - cast::transmute(&base.wrapper) + cast::transmute(&base.reflector_) } } } @@ -129,7 +129,7 @@ impl Traceable for Node { } } } - debug!("tracing %p?:", self.wrapper.get_jsobject()); + debug!("tracing %p?:", self.reflector_.get_jsobject()); trace_node(tracer, self.parent_node, "parent"); trace_node(tracer, self.first_child, "first child"); trace_node(tracer, self.last_child, "last child"); diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index af3eef00443..69ecf68a978 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -11,20 +11,20 @@ use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct Blob { - wrapper: Reflector + reflector_: Reflector } impl Blob { pub fn new() -> @mut Blob { @mut Blob { - wrapper: Reflector::new() + reflector_: Reflector::new() } } } impl Reflectable for Blob { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.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 9fb27e0178a..a9d48819839 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -12,7 +12,7 @@ use js::glue::RUST_OBJECT_TO_JSVAL; use std::cast; pub struct ClientRect { - wrapper: Reflector, + reflector_: Reflector, top: f32, bottom: f32, left: f32, @@ -26,7 +26,7 @@ impl ClientRect { bottom: bottom, left: left, right: right, - wrapper: Reflector::new() + reflector_: Reflector::new() }; rect.init_wrapper(cx, scope); rect @@ -64,7 +64,7 @@ impl ClientRect { impl Reflectable for ClientRect { fn reflector(&mut self) -> &mut Reflector { unsafe { - cast::transmute(&self.wrapper) + cast::transmute(&self.reflector_) } } diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index 6fd9794d996..f7f283a2ecd 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -12,14 +12,14 @@ use js::jsapi::{JSObject, JSContext}; use std::cast; pub struct ClientRectList { - wrapper: Reflector, + reflector_: Reflector, rects: ~[@mut ClientRect] } impl ClientRectList { pub fn new(rects: ~[@mut ClientRect], cx: *JSContext, scope: *JSObject) -> @mut ClientRectList { let list = @mut ClientRectList { - wrapper: Reflector::new(), + reflector_: Reflector::new(), rects: rects }; list.init_wrapper(cx, scope); @@ -51,7 +51,7 @@ impl ClientRectList { impl Reflectable for ClientRectList { fn reflector(&mut self) -> &mut Reflector { unsafe { - cast::transmute(&self.wrapper) + cast::transmute(&self.reflector_) } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 9bdeaa1f608..851b219a573 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -92,7 +92,7 @@ pub enum DocumentType { pub struct Document { root: Option>, - wrapper: Reflector, + reflector_: Reflector, window: Option<@mut Window>, doctype: DocumentType, title: ~str @@ -103,7 +103,7 @@ impl Document { pub fn new(window: Option<@mut Window>, doctype: DocumentType) -> Document { Document { root: None, - wrapper: Reflector::new(), + reflector_: Reflector::new(), window: window, doctype: doctype, title: ~"" @@ -175,7 +175,7 @@ impl DerivedWrapper for AbstractDocument { impl Reflectable for Document { fn reflector(&mut self) -> &mut Reflector { unsafe { - cast::transmute(&self.wrapper) + cast::transmute(&self.reflector_) } } @@ -502,7 +502,7 @@ impl Traceable for Document { debug!("tracing root node"); do root.with_base |node| { JS_CallTracer(tracer as *JSTracer, - node.wrapper.object, + node.reflector_.object, JSTRACE_OBJECT as u32); } } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index 15d1d7bcae3..3c317d09437 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -15,14 +15,14 @@ use dom::window::Window; pub struct DOMParser { owner: @mut Window, //XXXjdm Document instead? - wrapper: Reflector + reflector_: Reflector } impl DOMParser { pub fn new(owner: @mut Window) -> @mut DOMParser { let parser = @mut DOMParser { owner: owner, - wrapper: Reflector::new() + reflector_: Reflector::new() }; // TODO(tkuehn): This just handles the top-level page. Need to handle subframes. diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index deb4e46362c..3088c4c577e 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -26,7 +26,7 @@ pub enum Event_ { } pub struct Event { - wrapper: Reflector, + reflector_: Reflector, type_: DOMString, default_prevented: bool, cancelable: bool, @@ -37,7 +37,7 @@ pub struct Event { impl Event { pub fn new(type_: &DOMString) -> Event { Event { - wrapper: Reflector::new(), + reflector_: Reflector::new(), type_: (*type_).clone(), default_prevented: false, cancelable: true, @@ -115,7 +115,7 @@ impl Event { impl Reflectable for Event { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.reflector_) } } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 401bb36ce53..215f3d894a6 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -12,13 +12,13 @@ use js::jsapi::{JSObject, JSContext, JSVal}; use std::cast; pub struct EventTarget { - wrapper: Reflector + reflector_: Reflector } impl EventTarget { pub fn new() -> ~EventTarget { ~EventTarget { - wrapper: Reflector::new() + reflector_: Reflector::new() } } @@ -29,7 +29,7 @@ impl EventTarget { impl Reflectable for EventTarget { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.reflector_) } } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index bcd993d397e..fe80238ba34 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -21,14 +21,14 @@ enum FormDatum { pub struct FormData { data: HashMap<~str, FormDatum>, - wrapper: Reflector + reflector_: Reflector } impl FormData { pub fn new() -> @mut FormData { @mut FormData { data: HashMap::new(), - wrapper: Reflector::new() + reflector_: Reflector::new() } } @@ -52,7 +52,7 @@ impl FormData { impl Reflectable for FormData { fn reflector(&mut self) -> &mut Reflector { unsafe { - cast::transmute(&self.wrapper) + cast::transmute(&self.reflector_) } } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index cc137cd95fa..c9e51454ab7 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -15,14 +15,14 @@ use std::ptr; pub struct HTMLCollection { elements: ~[AbstractNode], - wrapper: Reflector + reflector_: Reflector } impl HTMLCollection { pub fn new(elements: ~[AbstractNode], cx: *JSContext, scope: *JSObject) -> @mut HTMLCollection { let collection = @mut HTMLCollection { elements: elements, - wrapper: Reflector::new() + reflector_: Reflector::new() }; collection.init_wrapper(cx, scope); collection @@ -71,7 +71,7 @@ impl BindingObject for HTMLCollection { impl Reflectable for HTMLCollection { fn reflector(&mut self) -> &mut Reflector { unsafe { - cast::transmute(&self.wrapper) + cast::transmute(&self.reflector_) } } diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index d2a3dc6b5ac..54363b6414d 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -12,13 +12,13 @@ use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct Navigator { - wrapper: Reflector + reflector_: Reflector } impl Navigator { pub fn new() -> @mut Navigator { @mut Navigator { - wrapper: Reflector::new() + reflector_: Reflector::new() } } @@ -89,7 +89,7 @@ impl Navigator { impl Reflectable for Navigator { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.reflector_) } } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 3e7c9e1e097..d3797200503 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -62,8 +62,8 @@ pub struct AbstractNodeChildrenIterator { /// the script task, this is the unit type `()`. For the layout task, this is /// `LayoutData`. pub struct Node { - /// The JavaScript wrapper for this node. - wrapper: Reflector, + /// The JavaScript reflector for this node. + reflector_: Reflector, /// The type of node that this is. type_id: NodeTypeId, @@ -465,7 +465,7 @@ impl Node { pub fn new(type_id: NodeTypeId) -> Node { Node { - wrapper: Reflector::new(), + reflector_: Reflector::new(), type_id: type_id, abstract: None, @@ -791,7 +791,7 @@ impl VoidPtrLike for AbstractNode { impl Reflectable for Node { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&mut self.wrapper) } + unsafe { cast::transmute(&mut self.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 e2c207bd5c6..0aeab8ae72a 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -8,14 +8,14 @@ use js::jsapi::{JSContext, JSObject}; use std::cast; pub struct ValidityState { - wrapper: Reflector, + reflector_: Reflector, state: u8 } impl ValidityState { pub fn valid() -> ValidityState { ValidityState { - wrapper: Reflector::new(), + reflector_: Reflector::new(), state: 0 } } @@ -61,7 +61,7 @@ impl ValidityState { impl Reflectable for ValidityState { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.reflector_) } } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 816d13ed6c2..f05fda15e4b 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -43,7 +43,7 @@ pub struct Window { page: @mut Page, script_chan: ScriptChan, compositor: @ScriptListener, - wrapper: Reflector, + reflector_: Reflector, timer_chan: SharedChan, navigator: Option<@mut Navigator>, image_cache_task: ImageCacheTask, @@ -137,7 +137,7 @@ impl Window { impl Reflectable for Window { fn reflector(&mut self) -> &mut Reflector { - unsafe { cast::transmute(&self.wrapper) } + unsafe { cast::transmute(&self.reflector_) } } fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { @@ -203,7 +203,7 @@ impl Window { page: page, script_chan: script_chan.clone(), compositor: compositor, - wrapper: Reflector::new(), + reflector_: Reflector::new(), timer_chan: { let (timer_port, timer_chan) = comm::stream::(); let id = page.id.clone(); @@ -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.object, + doc.reflector_.object, JSTRACE_OBJECT as u32); } } diff --git a/src/components/script/dom/windowproxy.rs b/src/components/script/dom/windowproxy.rs index fe31dedf50c..a96cfcc32d3 100644 --- a/src/components/script/dom/windowproxy.rs +++ b/src/components/script/dom/windowproxy.rs @@ -8,13 +8,13 @@ use script_task::page_from_context; use js::jsapi::{JSContext, JSObject}; pub struct WindowProxy { - wrapper: Reflector + reflector_: Reflector } impl WindowProxy { pub fn new() -> @mut WindowProxy { @mut WindowProxy { - wrapper: Reflector::new() + reflector_: Reflector::new() } }