aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 7172177af77..b3968a9205d 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -381,7 +381,7 @@ impl WindowMethods for Window {
// https://html.spec.whatwg.org/multipage/#dom-document-0
fn Document(&self) -> Root<Document> {
- self.browsing_context().as_ref().unwrap().active_document()
+ Root::from_ref(self.browsing_context().as_ref().unwrap().active_document())
}
// https://html.spec.whatwg.org/multipage/#dom-location
@@ -411,7 +411,7 @@ impl WindowMethods for Window {
// https://html.spec.whatwg.org/multipage/#dom-frameelement
fn GetFrameElement(&self) -> Option<Root<Element>> {
- self.browsing_context().as_ref().unwrap().frame_element()
+ self.browsing_context().as_ref().unwrap().frame_element().map(Root::from_ref)
}
// https://html.spec.whatwg.org/multipage/#dom-navigator
@@ -1248,11 +1248,11 @@ impl Window {
let browsing_context = browsing_context.as_ref().unwrap();
browsing_context.frame_element().map(|frame_element| {
- let window = window_from_node(frame_element.r());
+ let window = window_from_node(frame_element);
// 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())
})
}
}