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

Auto merge of #9729 - Ms2ger:bc-option, r=jdm

Browse source 
Stop returning an Option from Window::browsing_context.

A Window always has a WindowProxy; the only reason it's wrapped in a nullable
field is the order in which those objects are created.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9729)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-24 01:21:01 +05:30
commit d85ee09bc7
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/bindings/utils.rs
View file

@ -395,7 +395,7 @@ pub unsafe extern "C" fn outerize_global(_cx: *mut JSContext, obj: HandleObject)
debug!("outerizing");
let win = root_from_handleobject::<window::Window>(obj).unwrap();
let context = win.browsing_context();
context.as_ref().unwrap().window_proxy()
context.window_proxy()
}
/// Deletes the property `id` from `object`.

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

@ -314,8 +314,8 @@ impl Window {
&self.compositor
}
pub fn browsing_context(&self) -> Option<Root<BrowsingContext>> {
self.browsing_context.get()
pub fn browsing_context(&self) -> Root<BrowsingContext> {
self.browsing_context.get().unwrap()
}
pub fn page(&self) -> &Page {
@ -426,7 +426,7 @@ impl WindowMethods for Window {
// https://html.spec.whatwg.org/multipage/#dom-document-2
fn Document(&self) -> Root<Document> {
self.browsing_context().as_ref().unwrap().active_document()
self.browsing_context().active_document()
}
// https://html.spec.whatwg.org/multipage/#dom-location
@ -456,7 +456,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().map(Root::from_ref)
self.browsing_context().frame_element().map(Root::from_ref)
}
// https://html.spec.whatwg.org/multipage/#dom-navigator
@ -1283,12 +1283,12 @@ impl Window {
}
pub fn parent(&self) -> Option<Root<Window>> {
let browsing_context = self.browsing_context().unwrap();
let browsing_context = self.browsing_context();
browsing_context.frame_element().map(|frame_element| {
let window = window_from_node(frame_element);
let context = window.browsing_context();
context.unwrap().active_window()
context.active_window()
})
}
}