Title: [184607] branches/safari-601.1.32-branch/Source/WebCore
- Revision
- 184607
- Author
- matthew_han...@apple.com
- Date
- 2015-05-19 18:19:36 -0700 (Tue, 19 May 2015)
Log Message
Merge r184589. <rdar://problem/21009192>
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184606 => 184607)
--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-20 01:13:11 UTC (rev 184606)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-20 01:19:36 UTC (rev 184607)
@@ -1,3 +1,21 @@
+2015-05-19 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r184589. rdar://problem/21009192
+
+ 2015-05-19 Brent Fulgham <bfulg...@apple.com>
+
+ Scroll-snap animations should not start on axes with zero-delta
+ https://bugs.webkit.org/show_bug.cgi?id=145148
+
+ Reviewed by Dean Jackson.
+
+ Don't begin a scroll snap animation on an axis that had no change in position (on that axis)
+ during the gesture.
+
+ * platform/cocoa/ScrollController.mm:
+ (WebCore::ScrollController::processWheelEventForScrollSnapOnAxis): Don't begin a scroll snap
+ animation if no movement on this axis was ever made.
+
2015-05-18 Matthew Hanson <matthew_han...@apple.com>
Merge custom patch. rdar://problem/20950052
Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/cocoa/ScrollController.mm (184606 => 184607)
--- branches/safari-601.1.32-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-20 01:13:11 UTC (rev 184606)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-20 01:19:36 UTC (rev 184607)
@@ -547,7 +547,7 @@
if (snapState.m_numWheelDeltasTracked < snapState.wheelDeltaWindowSize)
snapState.pushInitialWheelDelta(wheelDelta);
- if (snapState.m_numWheelDeltasTracked == snapState.wheelDeltaWindowSize)
+ if ((snapState.m_numWheelDeltasTracked == snapState.wheelDeltaWindowSize) && snapState.averageInitialWheelDelta())
beginScrollSnapAnimation(axis, ScrollSnapState::Gliding);
}
break;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
