diff --git a/components/layout/query.rs b/components/layout/query.rs index f462118a832..b4008d24c60 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -147,7 +147,7 @@ impl LayoutRPC for LayoutRPCImpl { } } - fn nodes_from_point(&self) -> Vec { + fn nodes_from_point_response(&self) -> Vec { let &LayoutRPCImpl(ref rw_data) = self; let rw_data = rw_data.lock().unwrap(); rw_data.nodes_from_point_response.clone() diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index f2e1d3cec58..991d93f7fcd 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1883,7 +1883,7 @@ impl Document { return vec!(); }; - self.window.layout().nodes_from_point() + self.window.layout().nodes_from_point_response() } } diff --git a/components/script_layout_interface/rpc.rs b/components/script_layout_interface/rpc.rs index 7446c6f11c0..b07fa25a8c1 100644 --- a/components/script_layout_interface/rpc.rs +++ b/components/script_layout_interface/rpc.rs @@ -41,7 +41,7 @@ pub trait LayoutRPC { /// Requests the list of not-yet-loaded images that were encountered in the last reflow. fn pending_images(&self) -> Vec; /// Requests the list of nodes from the given point. - fn nodes_from_point(&self) -> Vec; + fn nodes_from_point_response(&self) -> Vec; fn text_index(&self) -> TextIndexResponse; } diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 84d30734ba0..8fdbc6e596e 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -6341,18 +6341,6 @@ {} ] ], - "mozilla/document_elementsFromPoint.html": [ - [ - "/_mozilla/mozilla/document_elementsFromPoint.html", - [ - [ - "/_mozilla/mozilla/document_elementsFromPoint_ref.html", - "==" - ] - ], - {} - ] - ], "mozilla/iframe/resize_after_load.html": [ [ "/_mozilla/mozilla/iframe/resize_after_load.html", @@ -9400,11 +9388,6 @@ {} ] ], - "mozilla/document_elementsFromPoint_ref.html": [ - [ - {} - ] - ], "mozilla/form_submit_about_frame.html": [ [ {} @@ -12615,6 +12598,12 @@ {} ] ], + "mozilla/document_elementsFromPoint.html": [ + [ + "/_mozilla/mozilla/document_elementsFromPoint.html", + {} + ] + ], "mozilla/document_getElementById.html": [ [ "/_mozilla/mozilla/document_getElementById.html", @@ -25155,12 +25144,8 @@ "testharness" ], "mozilla/document_elementsFromPoint.html": [ - "2349e1d102552a46bb8e3dd36c0b3396e0d6530b", - "reftest" - ], - "mozilla/document_elementsFromPoint_ref.html": [ - "4d1a1d0acc16bcb123781cbed47184ff308f3097", - "support" + "00da2141b1143619351c6fbb66d677ca9002a4a8", + "testharness" ], "mozilla/document_getElementById.html": [ "ae5270afde878c8fbe9b4a89c5c3f8ff609220dc", diff --git a/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint.html b/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint.html index d475afe7b55..a17f0b69816 100644 --- a/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint.html +++ b/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint.html @@ -1,7 +1,10 @@ - - +document.elementsFromPoint does not crash due to a missing display list + + diff --git a/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint_ref.html b/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint_ref.html deleted file mode 100644 index 564605f8554..00000000000 --- a/tests/wpt/mozilla/tests/mozilla/document_elementsFromPoint_ref.html +++ /dev/null @@ -1,3 +0,0 @@ - - -