Changeset 143148 in webkit

Timestamp:

Feb 17, 2013 10:31:19 PM (11 years ago)

Author:

mkwst@chromium.org

Message:

WheelEvent should not target text nodes.
​https://bugs.webkit.org/show_bug.cgi?id=109939

Reviewed by Darin Adler.

Source/WebCore:

WheelEvent, like other mouse events, should not target text nodes.
EventHandler correctly handles other mouse events by retargeting
events to text nodes' parents; this patch adds that logic to the
WheelEvent handler.

This should allow jQuery to stop working around WebKit's behavior[1].

[1]: ​https://github.com/jquery/jquery/commit/c61150427fc8ccc8e884df8f221a6c9bb5477929

Test: fast/events/wheelevent-in-text-node.html

• page/EventHandler.cpp:

(WebCore::EventHandler::handleWheelEvent):

If a WheelEvent's hit test lands on a text node, retarget the
event to the text node's parent. Do this before latching the node.

LayoutTests:

• fast/events/wheelevent-in-text-node-expected.txt: Added.
• fast/events/wheelevent-in-text-node.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/wheelevent-in-text-node-expected.txt (added)
• LayoutTests/fast/events/wheelevent-in-text-node.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-17  Mike West  <mkwst@chromium.org>
+
+        WheelEvent should not target text nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=109939
+
+        Reviewed by Darin Adler.
+
+        * fast/events/wheelevent-in-text-node-expected.txt: Added.
+        * fast/events/wheelevent-in-text-node.html: Added.
+
 2013-02-17  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-17  Mike West  <mkwst@chromium.org>
+
+        WheelEvent should not target text nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=109939
+
+        Reviewed by Darin Adler.
+
+        WheelEvent, like other mouse events, should not target text nodes.
+        EventHandler correctly handles other mouse events by retargeting
+        events to text nodes' parents; this patch adds that logic to the
+        WheelEvent handler.
+
+        This should allow jQuery to stop working around WebKit's behavior[1].
+
+        [1]: https://github.com/jquery/jquery/commit/c61150427fc8ccc8e884df8f221a6c9bb5477929
+
+        Test: fast/events/wheelevent-in-text-node.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleWheelEvent):
+            If a WheelEvent's hit test lands on a text node, retarget the
+            event to the text node's parent. Do this before latching the node.
+
 2013-02-17  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2324 +2324 @@
     LayoutPoint vPoint = view->windowToContents(e.position());
 
-    Node* node;
-    bool isOverWidget;
-
     HitTestRequest request(HitTestRequest::ReadOnly);
     HitTestResult result(vPoint);
@@ -2333 +2330 @@
     bool useLatchedWheelEventNode = e.useLatchedEventNode();
 
+    Node* node = result.innerNode();
+    // Wheel events should not dispatch to text nodes.
+    if (node && node->isTextNode()) {
+        AncestorChainWalker walker(node);
+        walker.parent();
+        node = walker.get();
+    }
+
+    bool isOverWidget;
     if (useLatchedWheelEventNode) {
         if (!m_latchedWheelEventNode) {
-            m_latchedWheelEventNode = result.innerNode();
+            m_latchedWheelEventNode = node;
             m_widgetIsLatched = result.isOverWidget();
-        }
-
-        node = m_latchedWheelEventNode.get();
+        } else
+            node = m_latchedWheelEventNode.get();
+
         isOverWidget = m_widgetIsLatched;
     } else {
@@ -2347 +2353 @@
             m_previousWheelScrolledNode = 0;
 
-        node = result.innerNode();
         isOverWidget = result.isOverWidget();
     }