Window should own Location, Document shouldn't

servo · Sep 20, 2017 · 3d00b0e · 3d00b0e
1 parent eefd59e
commit 3d00b0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
@@ -226,7 +226,6 @@ pub struct Document {
     node: Node,
     window: JS<Window>,
     implementation: MutNullableJS<DOMImplementation>,
-    location: MutNullableJS<Location>,
     content_type: DOMString,
     last_modified: Option<String>,
     encoding: Cell<EncodingRef>,
@@ -2222,7 +2221,6 @@ impl Document {
             window: JS::from_ref(window),
             has_browsing_context: has_browsing_context == HasBrowsingContext::Yes,
             implementation: Default::default(),
-            location: Default::default(),
             content_type: match content_type {
                 Some(string) => string,
                 None => DOMString::from(match is_html_document {
@@ -3438,7 +3436,11 @@ impl DocumentMethods for Document {
 
     // https://html.spec.whatwg.org/multipage/#dom-document-location
     fn GetLocation(&self) -> Option<Root<Location>> {
-        self.browsing_context().map(|_| self.location.or_init(|| Location::new(&self.window)))
+        if self.is_fully_active() {
+            Some(self.window.Location())
+        } else {
+            None
+        }
     }
 
     // https://dom.spec.whatwg.org/#dom-parentnode-children
@@ -3815,7 +3817,6 @@ impl DocumentMethods for Document {
 
         // Step 19.
         self.implementation.set(None);
-        self.location.set(None);
         self.images.set(None);
         self.embeds.set(None);
         self.links.set(None);

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
@@ -183,6 +183,7 @@ pub struct Window {
     image_cache_chan: Sender<ImageCacheMsg>,
     window_proxy: MutNullableJS<WindowProxy>,
     document: MutNullableJS<Document>,
+    location: MutNullableJS<Location>,
     history: MutNullableJS<History>,
     custom_element_registry: MutNullableJS<CustomElementRegistry>,
     performance: MutNullableJS<Performance>,
@@ -568,7 +569,7 @@ impl WindowMethods for Window {
 
     // https://html.spec.whatwg.org/multipage/#dom-location
     fn Location(&self) -> Root<Location> {
-        self.Document().GetLocation().unwrap()
+        self.location.or_init(|| Location::new(self))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-sessionstorage
@@ -1854,6 +1855,7 @@ impl Window {
             image_cache_chan,
             image_cache,
             navigator: Default::default(),
+            location: Default::default(),
             history: Default::default(),
             custom_element_registry: Default::default(),
             window_proxy: Default::default(),