Make DOM getters that return &JS<T> return Temporary<T> instead #3707

servo · Oct 22, 2014 · daf9e59 · daf9e59 · bors-servo · Oct 22, 2014
1 parent 590a931
commit daf9e59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
@@ -39,7 +39,7 @@ impl BrowserContext {
 
     pub fn active_window(&self) -> Temporary<Window> {
         let doc = self.active_document().root();
-        Temporary::new(doc.window().clone())
+        doc.window()
     }
 
     pub fn window_proxy(&self) -> *mut JSObject {

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
@@ -344,8 +344,8 @@ impl Document {
     }
 
     #[inline]
-    pub fn window<'a>(&'a self) -> &'a JS<Window> {
-        &self.window
+    pub fn window(&self) -> Temporary<Window> {
+        Temporary::new(self.window)
     }
 
     #[inline]

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
@@ -2163,7 +2163,7 @@ pub fn document_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Tempora
 
 pub fn window_from_node<T: NodeBase+Reflectable>(derived: JSRef<T>) -> Temporary<Window> {
     let document = document_from_node(derived).root();
-    Temporary::new(document.window().clone())
+    document.window()
 }
 
 impl<'a> VirtualMethods for JSRef<'a, Node> {