Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Return a reference in BrowserContext::active_window()

Browse source
This commit is contained in:
Anthony Ramine 2015-10-17 02:33:01 +02:00
parent 409b5e3695
commit 6ab7f64620
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/browsercontext.rs
View file

@ -48,8 +48,8 @@ impl BrowsingContext {
&*self.history[self.active_index].document &*self.history[self.active_index].document
} }
pub fn active_window(&self) -> Root<Window> { pub fn active_window(&self) -> &Window {
Root::from_ref(self.active_document().window()) self.active_document().window()
} }
pub fn frame_element(&self) -> Option<&Element> { pub fn frame_element(&self) -> Option<&Element> {
@ -63,8 +63,8 @@ impl BrowsingContext {
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn create_window_proxy(&mut self) { pub fn create_window_proxy(&mut self) {
let win = self.active_window(); // We inline self.active_window() because we can't borrow *self here.
let win = win.r(); let win = self.history[self.active_index].document.window();
let WindowProxyHandler(handler) = win.windowproxy_handler(); let WindowProxyHandler(handler) = win.windowproxy_handler();
assert!(!handler.is_null()); assert!(!handler.is_null());

2
components/script/dom/window.rs
View file

@ -1249,7 +1249,7 @@ impl Window {
// FIXME(https://github.com/rust-lang/rust/issues/23338) // FIXME(https://github.com/rust-lang/rust/issues/23338)
let r = window.r(); let r = window.r();
let context = r.browsing_context(); let context = r.browsing_context();
context.as_ref().unwrap().active_window() Root::from_ref(context.as_ref().unwrap().active_window())
}) })
} }
} }