Title: [184629] branches/safari-601.1.32.2-branch/Source/WebCore
- Revision
- 184629
- Author
- [email protected]
- Date
- 2015-05-20 02:07:47 -0700 (Wed, 20 May 2015)
Log Message
Merged r184589. rdar://problem/21009192
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184628 => 184629)
--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-20 09:06:46 UTC (rev 184628)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-20 09:07:47 UTC (rev 184629)
@@ -1,5 +1,23 @@
2015-05-20 Babak Shafiei <[email protected]>
+ Merge r184589.
+
+ 2015-05-19 Brent Fulgham <[email protected]>
+
+ 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-20 Babak Shafiei <[email protected]>
+
Merge r184404.
2015-05-15 Jeremy Jones <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm (184628 => 184629)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-20 09:06:46 UTC (rev 184628)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-20 09:07:47 UTC (rev 184629)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
