auto merge of #1098 : jdm/servo/borrow-fix, r=metajack

Needed for #1067.

2 files changed, 18 insertions, 6 deletions

diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs
index 99b75a39030..fc60c8486b3 100644
--- a/src/components/script/dom/navigator.rs
+++ b/src/components/script/dom/navigator.rs
@@ -5,21 +5,33 @@
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::bindings::utils::{DOMString, Fallible};
 use dom::bindings::codegen::NavigatorBinding;
+use dom::window::Window;
 use script_task::{page_from_context};
 
 use js::jsapi::{JSContext, JSObject};
 
 pub struct Navigator {
-    reflector_: Reflector
+    reflector_: Reflector //XXXjdm cycle: window->navigator->window
 }
 
 impl Navigator {
-    pub fn new() -> @mut Navigator {
-        @mut Navigator {
+    pub fn new_inherited() -> Navigator {
+        Navigator {
             reflector_: Reflector::new()
         }
     }
 
+    pub fn new(window: &Window) -> @mut Navigator {
+        let nav = @mut Navigator::new_inherited();
+        let cx = window.get_cx();
+        let scope = window.reflector().get_jsobject();
+        if NavigatorBinding::Wrap(cx, scope, nav).is_null() {
+            fail!("NavigatorBinding::Wrap failed");
+        }
+        assert!(nav.reflector().get_jsobject().is_not_null());
+        nav
+    }
+
     pub fn DoNotTrack(&self) -> DOMString {
         Some(~"unspecified")
     }
@@ -94,8 +106,8 @@ impl Reflectable for Navigator {
         &mut self.reflector_
     }
 
-    fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
-        NavigatorBinding::Wrap(cx, scope, self)
+    fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
+        unreachable!();
     }
 
     fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> {
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 82d098d9b22..1c42dde5d9d 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -119,7 +119,7 @@ impl Window {
 
     pub fn Navigator(&mut self) -> @mut Navigator {
         if self.navigator.is_none() {
-            self.navigator = Some(Navigator::new());
+            self.navigator = Some(Navigator::new(self));
         }
         self.navigator.unwrap()
     }