From 5a3ce597d3e4db10278f202cddd184e5aee004d6 Mon Sep 17 00:00:00 2001
From: Rizky Luthfianto <mrluthfianto@gmail.com>
Date: Sat, 16 Apr 2016 01:05:32 +0700
Subject: [PATCH] Fix Document#elementsFromPoint no viewport available test

---
 components/script/dom/document.rs                        | 6 ++++--
 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
-