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

Auto merge of #10426 - rilut:fix-elementsFromPoint-no-viewport-available-test, r=nox

Browse source 
Fix Document#elementsFromPoint no viewport available test

Fixes #10093 and improves #10034.

<!-- 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/10426)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-16 00:01:23 +05:30
commit 44d7657487
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/document.rs
View file

@ -1551,8 +1551,6 @@ impl Document {
} }
pub fn nodes_from_point(&self, page_point: &Point2D<f32>) -> Vec<UntrustedNodeAddress> { pub fn nodes_from_point(&self, page_point: &Point2D<f32>) -> Vec<UntrustedNodeAddress> {
assert!(self.GetDocumentElement().is_some());
self.window.layout().nodes_from_point(*page_point) self.window.layout().nodes_from_point(*page_point)
} }
} }
@ -2718,6 +2716,10 @@ impl DocumentMethods for Document {
let window = window_from_node(self); let window = window_from_node(self);
let viewport = window.window_size().unwrap().visible_viewport; let viewport = window.window_size().unwrap().visible_viewport;
if self.browsing_context().is_none() {
return vec!();
}
// Step 2 // Step 2
if x < 0.0 || y < 0.0 || x > viewport.width.get() || y > viewport.height.get() { if x < 0.0 || y < 0.0 || x > viewport.width.get() || y > viewport.height.get() {
return vec!(); return vec!();

3
tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini
View file

@ -12,6 +12,3 @@
[no hit target at x,y] [no hit target at x,y]
expected: FAIL expected: FAIL
[No viewport available]
expected: FAIL