Changeset 167648 in webkit

Timestamp:

Apr 21, 2014 8:59:06 PM (10 years ago)

Author:

Brent Fulgham

Message:

[Mac] After a horizontal overflow scroll with a mechanical wheel mouse, vertical scrolling no longer works
​https://bugs.webkit.org/show_bug.cgi?id=131960
<rdar://problem/16142100>

Reviewed by Darin Adler.

Source/WebCore:
Test: platform/mac/fast/scrolling/scroll-div-no-latching.html

• page/EventHandler.cpp:

(WebCore::EventHandler::handleWheelEvent): When not latching, always clear m_latchedWheelEventElement and m_previousWheelScrolledElement.

LayoutTests:

• platform/mac/fast/scrolling/scroll-div-no-latching-expected.txt: Added.
• platform/mac/fast/scrolling/scroll-div-no-latching.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/scrolling/scroll-div-no-latching-expected.txt (added)
• LayoutTests/platform/mac/fast/scrolling/scroll-div-no-latching.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Mac] After a horizontal overflow scroll with a mechanical wheel mouse, vertical scrolling no longer works
+        https://bugs.webkit.org/show_bug.cgi?id=131960
+        <rdar://problem/16142100>
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/fast/scrolling/scroll-div-no-latching-expected.txt: Added.
+        * platform/mac/fast/scrolling/scroll-div-no-latching.html: Added.
+
 2014-04-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Mac] After a horizontal overflow scroll with a mechanical wheel mouse, vertical scrolling no longer works
+        https://bugs.webkit.org/show_bug.cgi?id=131960
+        <rdar://problem/16142100>
+
+        Reviewed by Darin Adler.
+
+        Test: platform/mac/fast/scrolling/scroll-div-no-latching.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleWheelEvent): When not latching, always clear m_latchedWheelEventElement and m_previousWheelScrolledElement.
+
 2014-04-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2577 +2577 @@
     platformPrepareForWheelEvents(e, result, element, scrollableContainer, scrollableArea, isOverWidget);
 
+    if (!e.useLatchedEventElement()) {
+        m_latchedWheelEventElement = nullptr;
+        m_previousWheelScrolledElement = nullptr;
+    }
+
     // FIXME: It should not be necessary to do this mutation here.
     // Instead, the handlers should know convert vertical scrolls