From 1f31d5b856ba33a32336f0c24e658f0bac21eede Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 17 Oct 2015 02:03:55 +0200
Subject: Return a reference in BrowserContext::active_document()

---
 components/script/dom/browsercontext.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'components/script/dom/browsercontext.rs')

diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index af2bfbdc81e..87d90f8e64f 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -44,13 +44,12 @@ impl BrowsingContext {
         }
     }
 
-    pub fn active_document(&self) -> Root<Document> {
-        self.history[self.active_index].document.root()
+    pub fn active_document(&self) -> &Document {
+        &*self.history[self.active_index].document
     }
 
     pub fn active_window(&self) -> Root<Window> {
-        let doc = self.active_document();
-        doc.r().window()
+        self.active_document().window()
     }
 
     pub fn frame_element(&self) -> Option<Root<Element>> {
-- 
cgit v1.2.3


From 264e94359712d143168ec47b3403c9285efb3354 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 17 Oct 2015 02:17:25 +0200
Subject: Return a reference in BrowserContext::frame_element()

---
 components/script/dom/browsercontext.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'components/script/dom/browsercontext.rs')

diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 87d90f8e64f..55e070ef10f 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -52,8 +52,8 @@ impl BrowsingContext {
         self.active_document().window()
     }
 
-    pub fn frame_element(&self) -> Option<Root<Element>> {
-        self.frame_element.as_ref().map(JS::root)
+    pub fn frame_element(&self) -> Option<&Element> {
+        self.frame_element.as_ref().map(|element| &**element)
     }
 
     pub fn window_proxy(&self) -> *mut JSObject {
-- 
cgit v1.2.3


From 409b5e3695828e01fc25cbab96148c4932f07cad Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 17 Oct 2015 02:23:25 +0200
Subject: Return a reference in Document::window()

---
 components/script/dom/browsercontext.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'components/script/dom/browsercontext.rs')

diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 55e070ef10f..2b00f346c1e 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -49,7 +49,7 @@ impl BrowsingContext {
     }
 
     pub fn active_window(&self) -> Root<Window> {
-        self.active_document().window()
+        Root::from_ref(self.active_document().window())
     }
 
     pub fn frame_element(&self) -> Option<&Element> {
-- 
cgit v1.2.3


From 6ab7f646203e168c8067acf69ad262e0f3c3fe19 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 17 Oct 2015 02:33:01 +0200
Subject: Return a reference in BrowserContext::active_window()

---
 components/script/dom/browsercontext.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'components/script/dom/browsercontext.rs')

diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 2b00f346c1e..60dbdc5523e 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -48,8 +48,8 @@ impl BrowsingContext {
         &*self.history[self.active_index].document
     }
 
-    pub fn active_window(&self) -> Root<Window> {
-        Root::from_ref(self.active_document().window())
+    pub fn active_window(&self) -> &Window {
+        self.active_document().window()
     }
 
     pub fn frame_element(&self) -> Option<&Element> {
@@ -63,8 +63,8 @@ impl BrowsingContext {
 
     #[allow(unsafe_code)]
     pub fn create_window_proxy(&mut self) {
-        let win = self.active_window();
-        let win = win.r();
+        // We inline self.active_window() because we can't borrow *self here.
+        let win = self.history[self.active_index].document.window();
 
         let WindowProxyHandler(handler) = win.windowproxy_handler();
         assert!(!handler.is_null());
-- 
cgit v1.2.3