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: [PATCH] Return a reference in BrowserContext::active_window()

---
 components/script/dom/browsercontext.rs | 8 ++++----
 components/script/dom/window.rs         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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());
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 3b56b96ddb1..22598fbf844 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1249,7 +1249,7 @@ impl Window {
             // FIXME(https://github.com/rust-lang/rust/issues/23338)
             let r = window.r();
             let context = r.browsing_context();
-            context.as_ref().unwrap().active_window()
+            Root::from_ref(context.as_ref().unwrap().active_window())
         })
     }
 }