Auto merge of #11680 - pcwalton:wr-overflow-scroll-hit-testing, r=jdm

script: When using WebRender, keep the DOM-side scroll positions for elements with `overflow: scroll` up to date, and take them into account when doing hit testing.

Closes #11648.

r? @jdm
cc @paulrouget

<!-- 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/11680)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 1 deletions

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 3032abe0685..a3289cca56e 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -298,6 +298,10 @@ impl Node {
         self.owner_doc().content_and_heritage_changed(self, NodeDamage::OtherNodeDamage);
         child.owner_doc().content_and_heritage_changed(child, NodeDamage::OtherNodeDamage);
     }
+
+    pub fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
+        UntrustedNodeAddress(self.reflector().get_jsobject().get() as *const c_void)
+    }
 }
 
 pub struct QuerySelectorIterator {
@@ -622,7 +626,7 @@ impl Node {
     pub fn scroll_offset(&self) -> Point2D<f32> {
         let document = self.owner_doc();
         let window = document.window();
-        window.scroll_offset_query(self.to_trusted_node_address())
+        window.scroll_offset_query(self)
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-before