diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-16 00:01:23 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-16 00:01:23 +0530 |
| commit | 44d7657487797575bb47aa295a13b496dd2cd69c (patch) | |
| tree | b6d63ec0371419eeffbd62cfa4a6b1cc19104f1f | |
| parent | bfe54539d290cb287e59e8ba106a54a3fab6201a (diff) | |
| parent | 5a3ce597d3e4db10278f202cddd184e5aee004d6 (diff) | |
| download | servo-44d7657487797575bb47aa295a13b496dd2cd69c.tar.gz servo-44d7657487797575bb47aa295a13b496dd2cd69c.zip | |
Auto merge of #10426 - rilut:fix-elementsFromPoint-no-viewport-available-test, r=nox
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 -->
| -rw-r--r-- | components/script/dom/document.rs | 6 | ||||
| -rw-r--r-- | tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index bb5f85e7438..b76df5d6aa7 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1551,8 +1551,6 @@ impl Document { } 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) } } @@ -2718,6 +2716,10 @@ impl DocumentMethods for Document { let window = window_from_node(self); let viewport = window.window_size().unwrap().visible_viewport; + if self.browsing_context().is_none() { + return vec!(); + } + // Step 2 if x < 0.0 || y < 0.0 || x > viewport.width.get() || y > viewport.height.get() { return vec!(); diff --git a/tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini b/tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini index ceb62f43b0b..72e4c9cb08d 100644 --- a/tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini +++ b/tests/wpt/metadata/cssom-view/elementsFromPoint.html.ini @@ -12,6 +12,3 @@ [no hit target at x,y] expected: FAIL - [No viewport available] - expected: FAIL - |