From daf9e59869b037279a84ae625889459afe459096 Mon Sep 17 00:00:00 2001 From: Edit Balint Date: Wed, 22 Oct 2014 15:18:48 +0200 Subject: [PATCH] Make DOM getters that return &JS return Temporary instead #3707 --- components/script/dom/browsercontext.rs | 2 +- components/script/dom/document.rs | 4 ++-- components/script/dom/node.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index 1a64068bd9d2..5984ec3b70e9 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -39,7 +39,7 @@ impl BrowserContext { pub fn active_window(&self) -> Temporary { 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 index 340e46db95e5..cc2fed3682e2 100644 --- 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 { - &self.window + pub fn window(&self) -> Temporary { + Temporary::new(self.window) } #[inline] diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index e1ff126f4316..e47e67419ba7 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2163,7 +2163,7 @@ pub fn document_from_node(derived: JSRef) -> Tempora pub fn window_from_node(derived: JSRef) -> Temporary { let document = document_from_node(derived).root(); - Temporary::new(document.window().clone()) + document.window() } impl<'a> VirtualMethods for JSRef<'a, Node> {