Title: [104839] trunk/Source/WebCore
- Revision
- 104839
- Author
- ander...@apple.com
- Date
- 2012-01-12 11:19:45 -0800 (Thu, 12 Jan 2012)
Log Message
Remove the last non-ScrollElasticityController call from ScrollAnimatorMac::snapRubberBandTimerFired
https://bugs.webkit.org/show_bug.cgi?id=76193
Reviewed by Andreas Kling.
Use ScrollElasticityControllerClient::immediateScrollBy for the final scroll before the rubber-band timer stops.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104838 => 104839)
--- trunk/Source/WebCore/ChangeLog 2012-01-12 19:15:27 UTC (rev 104838)
+++ trunk/Source/WebCore/ChangeLog 2012-01-12 19:19:45 UTC (rev 104839)
@@ -1,3 +1,15 @@
+2012-01-12 Anders Carlsson <ander...@apple.com>
+
+ Remove the last non-ScrollElasticityController call from ScrollAnimatorMac::snapRubberBandTimerFired
+ https://bugs.webkit.org/show_bug.cgi?id=76193
+
+ Reviewed by Andreas Kling.
+
+ Use ScrollElasticityControllerClient::immediateScrollBy for the final scroll before the rubber-band timer stops.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+
2011-09-26 Jer Noble <jer.no...@apple.com>
Emit an error event when a request to enter full-screen is rejected.
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104838 => 104839)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 19:15:27 UTC (rev 104838)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 19:19:45 UTC (rev 104839)
@@ -1395,8 +1395,7 @@
m_scrollElasticityController.m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(newStretch.width()));
m_scrollElasticityController.m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(newStretch.height()));
} else {
- immediateScrollTo(m_scrollElasticityController.m_origOrigin);
-
+ m_scrollElasticityController.m_client->immediateScrollBy(m_scrollElasticityController.m_origOrigin - m_scrollElasticityController.m_client->absoluteScrollPosition());
m_scrollElasticityController.m_client->stopSnapRubberbandTimer();
m_scrollElasticityController.m_stretchScrollForce = FloatSize();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
