Pass &JS<Window> to reflect_dom_object.

src/components/script/dom/attr.rs

@@ -58,7 +58,7 @@ impl Attr {
                   name: DOMString, namespace: Namespace,
                   prefix: Option<DOMString>) -> JS<Attr> {
         let attr = Attr::new_inherited(local_name, value, name, namespace, prefix);
-        reflect_dom_object(~attr, window.get(), AttrBinding::Wrap)
+        reflect_dom_object(~attr, window, AttrBinding::Wrap)
     }
 
     pub fn set_value(&mut self, value: DOMString) {

src/components/script/dom/attrlist.rs

@@ -27,7 +27,7 @@ impl AttrList {
 
     pub fn new(window: &JS<Window>, elem: &JS<Element>) -> JS<AttrList> {
         reflect_dom_object(~AttrList::new_inherited(window.clone(), elem.clone()),
-                           window.get(), AttrListBinding::Wrap)
+                           window, AttrListBinding::Wrap)
     }
 
     pub fn Length(&self) -> u32 {

src/components/script/dom/bindings/js.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::utils::{Reflector, Reflectable};
-use dom::window;
+use dom::window::Window;
 use js::jsapi::{JSContext, JSObject};
 use layout_interface::TrustedNodeAddress;
 
@@ -31,10 +31,10 @@ impl <T> Clone for JS<T> {
 
 impl<T: Reflectable> JS<T> {
     pub fn new(mut obj: ~T,
-               window:  &window::Window,
+               window:  &JS<Window>,
                wrap_fn: extern "Rust" fn(*JSContext, *JSObject, ~T) -> *JSObject) -> JS<T> {
-        let cx = window.get_cx();
+        let cx = window.get().get_cx();
-        let scope = window.reflector().get_jsobject();
+        let scope = window.get().reflector().get_jsobject();
         let raw: *mut T = &mut *obj;
         if wrap_fn(cx, scope, obj).is_null() {
             fail!("Could not eagerly wrap object");

src/components/script/dom/bindings/utils.rs

@@ -493,7 +493,7 @@ pub trait Reflectable {
 
 pub fn reflect_dom_object<T: Reflectable>
         (obj:     ~T,
-         window:  &window::Window,
+         window:  &JS<window::Window>,
          wrap_fn: extern "Rust" fn(*JSContext, *JSObject, ~T) -> *JSObject)
          ->       JS<T> {
     JS::new(obj, window, wrap_fn)

src/components/script/dom/blob.rs

@@ -25,7 +25,7 @@ impl Blob {
 
     pub fn new(window: &JS<Window>) -> JS<Blob> {
         reflect_dom_object(~Blob::new_inherited(window.clone()),
-                           window.get(),
+                           window,
                            BlobBinding::Wrap)
     }
 }

src/components/script/dom/clientrect.rs

@@ -36,7 +36,7 @@ impl ClientRect {
                top: Au, bottom: Au,
                left: Au, right: Au) -> JS<ClientRect> {
         let rect = ClientRect::new_inherited(window.clone(), top, bottom, left, right);
-        reflect_dom_object(~rect, window.get(), ClientRectBinding::Wrap)
+        reflect_dom_object(~rect, window, ClientRectBinding::Wrap)
     }
 
 

src/components/script/dom/clientrectlist.rs

@@ -28,7 +28,7 @@ impl ClientRectList {
     pub fn new(window: &JS<Window>,
                rects: ~[JS<ClientRect>]) -> JS<ClientRectList> {
         reflect_dom_object(~ClientRectList::new_inherited(window.clone(), rects),
-                           window.get(), ClientRectListBinding::Wrap)
+                           window, ClientRectListBinding::Wrap)
     }
 
     pub fn Length(&self) -> u32 {

src/components/script/dom/console.rs

@@ -21,7 +21,7 @@ impl Console {
     }
 
     pub fn new(window: &JS<Window>) -> JS<Console> {
-        reflect_dom_object(~Console::new_inherited(), window.get(), ConsoleBinding::Wrap)
+        reflect_dom_object(~Console::new_inherited(), window, ConsoleBinding::Wrap)
     }
 
     pub fn Log(&self, message: DOMString) {

src/components/script/dom/document.rs

@@ -89,7 +89,7 @@ impl Document {
              wrap_fn:   extern "Rust" fn(*JSContext, *JSObject, ~D) -> *JSObject)
              -> JS<D> {
         assert!(document.reflector().get_jsobject().is_null());
-        let raw_doc = reflect_dom_object(document, window.get(), wrap_fn);
+        let raw_doc = reflect_dom_object(document, window, wrap_fn);
         assert!(raw_doc.reflector().get_jsobject().is_not_null());
 
         let document = DocumentCast::from(&raw_doc);

src/components/script/dom/domexception.rs

@@ -49,7 +49,7 @@ impl DOMException {
     }
 
     pub fn new(window: &JS<Window>, code: DOMErrorName) -> JS<DOMException> {
-        reflect_dom_object(~DOMException::new_inherited(code), window.get(), DOMExceptionBinding::Wrap)
+        reflect_dom_object(~DOMException::new_inherited(code), window, DOMExceptionBinding::Wrap)
     }
 }
 

src/components/script/dom/domimplementation.rs

@@ -34,7 +34,7 @@ impl DOMImplementation {
     }
 
     pub fn new(owner: &JS<Window>) -> JS<DOMImplementation> {
-        reflect_dom_object(~DOMImplementation::new_inherited(owner.clone()), owner.get(),
+        reflect_dom_object(~DOMImplementation::new_inherited(owner.clone()), owner,
                            DOMImplementationBinding::Wrap)
     }
 }

src/components/script/dom/domparser.rs

@@ -26,7 +26,7 @@ impl DOMParser {
     }
 
     pub fn new(owner: &JS<Window>) -> JS<DOMParser> {
-        reflect_dom_object(~DOMParser::new_inherited(owner.clone()), owner.get(),
+        reflect_dom_object(~DOMParser::new_inherited(owner.clone()), owner,
                            DOMParserBinding::Wrap)
     }
 

src/components/script/dom/event.rs

@@ -77,7 +77,7 @@ impl Event {
 
     pub fn new(window: &JS<Window>) -> JS<Event> {
         reflect_dom_object(~Event::new_inherited(HTMLEventTypeId),
-                           window.get(),
+                           window,
                            EventBinding::Wrap)
     }
 

src/components/script/dom/formdata.rs

@@ -38,7 +38,7 @@ impl FormData {
     }
 
     pub fn new(form: Option<JS<HTMLFormElement>>, window: &JS<Window>) -> JS<FormData> {
-        reflect_dom_object(~FormData::new_inherited(form, window.clone()), window.get(), FormDataBinding::Wrap)
+        reflect_dom_object(~FormData::new_inherited(form, window.clone()), window, FormDataBinding::Wrap)
     }
 
     pub fn Constructor(window: &JS<Window>, form: Option<JS<HTMLFormElement>>)

src/components/script/dom/htmlcollection.rs

@@ -32,7 +32,7 @@ impl HTMLCollection {
 
     pub fn new(window: &JS<Window>, elements: ~[JS<Element>]) -> JS<HTMLCollection> {
         reflect_dom_object(~HTMLCollection::new_inherited(window.clone(), elements),
-                           window.get(), HTMLCollectionBinding::Wrap)
+                           window, HTMLCollectionBinding::Wrap)
     }
     
     pub fn Length(&self) -> u32 {

src/components/script/dom/location.rs

@@ -43,7 +43,7 @@ impl Location {
 
     pub fn new(window: &JS<Window>, page: Rc<Page>) -> JS<Location> {
         reflect_dom_object(~Location::new_inherited(page),
-                           window.get(),
+                           window,
                            LocationBinding::Wrap)
     }
 

src/components/script/dom/mouseevent.rs

@@ -54,7 +54,7 @@ impl MouseEvent {
 
     pub fn new(window: &JS<Window>) -> JS<MouseEvent> {
         reflect_dom_object(~MouseEvent::new_inherited(),
-                           window.get(),
+                           window,
                            MouseEventBinding::Wrap)
     }
 

src/components/script/dom/navigator.rs

@@ -23,7 +23,7 @@ impl Navigator {
 
     pub fn new(window: &JS<Window>) -> JS<Navigator> {
         reflect_dom_object(~Navigator::new_inherited(),
-                           window.get(),
+                           window,
                            NavigatorBinding::Wrap)
     }
 

src/components/script/dom/node.rs

@@ -757,7 +757,7 @@ impl Node {
              wrap_fn:   extern "Rust" fn(*JSContext, *JSObject, ~N) -> *JSObject)
              -> JS<N> {
         assert!(node.reflector().get_jsobject().is_null());
-        let node = reflect_dom_object(node, document.get().window.get(), wrap_fn);
+        let node = reflect_dom_object(node, &document.get().window, wrap_fn);
         assert!(node.reflector().get_jsobject().is_not_null());
         node
     }

src/components/script/dom/nodelist.rs

@@ -34,7 +34,7 @@ impl NodeList {
     pub fn new(window: &JS<Window>,
                list_type: NodeListType) -> JS<NodeList> {
         reflect_dom_object(~NodeList::new_inherited(window.clone(), list_type),
-                           window.get(), NodeListBinding::Wrap)
+                           window, NodeListBinding::Wrap)
     }
 
     pub fn new_simple_list(window: &JS<Window>, elements: ~[JS<Node>]) -> JS<NodeList> {

src/components/script/dom/uievent.rs

@@ -37,7 +37,7 @@ impl UIEvent {
 
     pub fn new(window: &JS<Window>) -> JS<UIEvent> {
         reflect_dom_object(~UIEvent::new_inherited(UIEventTypeId),
-                           window.get(),
+                           window,
                            UIEventBinding::Wrap)
     }
 

src/components/script/dom/validitystate.rs

@@ -25,7 +25,7 @@ impl ValidityState {
 
     pub fn new(window: &JS<Window>) -> JS<ValidityState> {
         reflect_dom_object(~ValidityState::new_inherited(window.clone()),
-                           window.get(),
+                           window,
                            ValidityStateBinding::Wrap)
     }
 }

src/components/script/dom/windowproxy.rs

@@ -17,7 +17,7 @@ impl WindowProxy {
         let proxy = ~WindowProxy {
             reflector_: Reflector::new()
         };
-        reflect_dom_object(proxy, owner.get(), WindowProxyBinding::Wrap)
+        reflect_dom_object(proxy, owner, WindowProxyBinding::Wrap)
     }
 }