Changeset 194004 in webkit

Timestamp:

Dec 11, 2015 10:58:15 PM (8 years ago)

Author:

Simon Fraser

Message:

Mousewheel events don't work in iframes in RTL documents
​https://bugs.webkit.org/show_bug.cgi?id=152200

Reviewed by Beth Dakin.

Source/WebCore:

When dispatching wheel events, the testing of the event point against the
non-fast scrollable region was broken in an RTL document. Fix by taking
the scrollOrigin into account in ScrollingTreeFrameScrollingNode::viewToContentsOffset().

Test: fast/scrolling/rtl-point-in-iframe.html

• page/scrolling/ScrollingTreeFrameScrollingNode.cpp:

(WebCore::ScrollingTreeFrameScrollingNode::viewToContentsOffset):

LayoutTests:

Try dispatching wheel events to an iframe in an RTL document.

• fast/scrolling/rtl-point-in-iframe-expected.txt: Added.
• fast/scrolling/rtl-point-in-iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/rtl-point-in-iframe-expected.txt (added)
• LayoutTests/fast/scrolling/rtl-point-in-iframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Mousewheel events don't work in iframes in RTL documents
+        https://bugs.webkit.org/show_bug.cgi?id=152200
+
+        Reviewed by Beth Dakin.
+        
+        Try dispatching wheel events to an iframe in an RTL document.
+
+        * fast/scrolling/rtl-point-in-iframe-expected.txt: Added.
+        * fast/scrolling/rtl-point-in-iframe.html: Added.
+
 2015-12-11  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Mousewheel events don't work in iframes in RTL documents
+        https://bugs.webkit.org/show_bug.cgi?id=152200
+
+        Reviewed by Beth Dakin.
+        
+        When dispatching wheel events, the testing of the event point against the
+        non-fast scrollable region was broken in an RTL document. Fix by taking
+        the scrollOrigin into account in ScrollingTreeFrameScrollingNode::viewToContentsOffset().
+
+        Test: fast/scrolling/rtl-point-in-iframe.html
+
+        * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+        (WebCore::ScrollingTreeFrameScrollingNode::viewToContentsOffset):
+
 2015-12-11  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp

@@ -92 +92 @@
 FloatSize ScrollingTreeFrameScrollingNode::viewToContentsOffset(const FloatPoint& scrollOffset) const
 {
-    return toFloatSize(scrollOffset) - FloatSize(0, headerHeight() + topContentInset());
+    return toFloatSize(scrollOffset) - toFloatSize(scrollOrigin()) - FloatSize(0, headerHeight() + topContentInset());
 }