Title: [167650] trunk
- Revision
- 167650
- Author
- [email protected]
- Date
- 2014-04-21 22:44:49 -0700 (Mon, 21 Apr 2014)
Log Message
Source/WebCore: [Mac] Follow-up: 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>
Unreviewed build fix.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent): The test to clear the
last scrolled node was too broad. It should only follow this path
if both the phase and momentum phase are 'None'.
Tools: Unreviewed build fix.
* DumpRenderTree/mac/EventSendingController.mm:
(-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]):
Correct a typo that prevented tests from working properly.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167649 => 167650)
--- trunk/Source/WebCore/ChangeLog 2014-04-22 04:26:25 UTC (rev 167649)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 05:44:49 UTC (rev 167650)
@@ -1,5 +1,18 @@
2014-04-21 Brent Fulgham <[email protected]>
+ [Mac] Follow-up: 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>
+
+ Unreviewed build fix.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent): The test to clear the
+ last scrolled node was too broad. It should only follow this path
+ if both the phase and momentum phase are 'None'.
+
+2014-04-21 Brent Fulgham <[email protected]>
+
[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>
Modified: trunk/Source/WebCore/page/EventHandler.cpp (167649 => 167650)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 04:26:25 UTC (rev 167649)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 05:44:49 UTC (rev 167650)
@@ -2576,7 +2576,7 @@
ScrollableArea* scrollableArea = nullptr;
platformPrepareForWheelEvents(e, result, element, scrollableContainer, scrollableArea, isOverWidget);
- if (!e.useLatchedEventElement()) {
+ if (e.phase() == PlatformWheelEventPhaseNone && e.momentumPhase() == PlatformWheelEventPhaseNone) {
m_latchedWheelEventElement = nullptr;
m_previousWheelScrolledElement = nullptr;
}
Modified: trunk/Tools/ChangeLog (167649 => 167650)
--- trunk/Tools/ChangeLog 2014-04-22 04:26:25 UTC (rev 167649)
+++ trunk/Tools/ChangeLog 2014-04-22 05:44:49 UTC (rev 167650)
@@ -1,3 +1,11 @@
+2014-04-21 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix.
+
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]):
+ Correct a typo that prevented tests from working properly.
+
2014-04-21 Martin Robinson <[email protected]>
[GTK] Should have the ability to output composited contents during layout testing
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (167649 => 167650)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-04-22 04:26:25 UTC (rev 167649)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-04-22 05:44:49 UTC (rev 167650)
@@ -714,7 +714,7 @@
phase = 0;
else if ([phaseName isEqualToString: @"began"])
phase = 1; // kCGScrollPhaseBegan
- else if ([phaseName isEqualToString: @"changd"])
+ else if ([phaseName isEqualToString: @"changed"])
phase = 2; // kCGScrollPhaseChanged;
else if ([phaseName isEqualToString: @"ended"])
phase = 4; // kCGScrollPhaseEnded
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
