Rename WrapperCache to Reflector.

I think the abstraction from the raw JSObject is still probably worthwhile for
now.

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<ScriptView>) -> *JSObject
 }
 
 impl Reflectable for AbstractNode<ScriptView> {
-    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<AbstractNode<ScriptView>>,
-    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<ScriptView>],
-    wrapper: WrapperCache
+    wrapper: Reflector
 }
 
 impl HTMLCollection {
     pub fn new(elements: ~[AbstractNode<ScriptView>], 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<View> {
 /// `LayoutData`.
 pub struct Node<View> {
     /// 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<ScriptView> {
 
     pub fn new(type_id: NodeTypeId) -> Node<ScriptView> {
         Node {
-            wrapper: WrapperCache::new(),
+            wrapper: Reflector::new(),
             type_id: type_id,
 
             abstract: None,
@@ -790,7 +790,7 @@ impl VoidPtrLike for AbstractNode<LayoutView> {
 }
 
 impl Reflectable for Node<ScriptView> {
-    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<TimerControlMsg>,
     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::<TimerControlMsg>();
                 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()
     }