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 #11548 - kevgs:default_view2, r=Ms2ger

Browse source 
Make Document::DefaultView return a null value when there's no browsing context

Fixes #11469.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11548)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-09 02:48:30 -05:00
commit 77e0089c12
7 changed files with 66 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/script/dom/element.rs
View file

@ -1315,7 +1315,10 @@ impl Element {
}
// Step 5
let win = doc.DefaultView();
let win = match doc.GetDefaultView() {
None => return,
Some(win) => win,
};
// Step 7
if *self.root_element() == *self {
@ -1653,7 +1656,10 @@ impl ElementMethods for Element {
}
// Step 3
let win = doc.DefaultView();
let win = match doc.GetDefaultView() {
None => return 0.0,
Some(win) => win,
};
// Step 5
if *self.root_element() == *self {
@ -1701,7 +1707,10 @@ impl ElementMethods for Element {
}
// Step 5
let win = doc.DefaultView();
let win = match doc.GetDefaultView() {
None => return,
Some(win) => win,
};
// Step 7
if *self.root_element() == *self {
@ -1739,7 +1748,10 @@ impl ElementMethods for Element {
}
// Step 3
let win = doc.DefaultView();
let win = match doc.GetDefaultView() {
None => return 0.0,
Some(win) => win,
};
// Step 5
if *self.root_element() == *self {
@ -1787,7 +1799,10 @@ impl ElementMethods for Element {
}
// Step 5
let win = doc.DefaultView();
let win = match doc.GetDefaultView() {
None => return,
Some(win) => win,
};
// Step 7
if *self.root_element() == *self {