Title: [104849] trunk/Source/WebCore
- Revision
- 104849
- Author
- ander...@apple.com
- Date
- 2012-01-12 13:08:33 -0800 (Thu, 12 Jan 2012)
Log Message
Make all calls to pinnedInDirection go through the ScrollElasticityController
https://bugs.webkit.org/show_bug.cgi?id=76204
Reviewed by Andreas Kling.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104848 => 104849)
--- trunk/Source/WebCore/ChangeLog 2012-01-12 20:50:25 UTC (rev 104848)
+++ trunk/Source/WebCore/ChangeLog 2012-01-12 21:08:33 UTC (rev 104849)
@@ -1,3 +1,13 @@
+2012-01-12 Anders Carlsson <ander...@apple.com>
+
+ Make all calls to pinnedInDirection go through the ScrollElasticityController
+ https://bugs.webkit.org/show_bug.cgi?id=76204
+
+ Reviewed by Andreas Kling.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
+
2012-01-12 Stephen White <senorbla...@chromium.org>
[chromium] Re-enable Skia feColorMatrix filter implementation.
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104848 => 104849)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 20:50:25 UTC (rev 104848)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2012-01-12 21:08:33 UTC (rev 104849)
@@ -1150,7 +1150,7 @@
}
if (isVerticallyStretched) {
- if (!isHorizontallyStretched && pinnedInDirection(deltaX, 0)) {
+ if (!isHorizontallyStretched && m_scrollElasticityController.m_client->pinnedInDirection(FloatSize(deltaX, 0))) {
// Stretching only in the vertical.
if (deltaY != 0 && (fabsf(deltaX / deltaY) < rubberbandDirectionLockStretchRatio))
deltaX = 0;
@@ -1162,7 +1162,7 @@
}
} else if (isHorizontallyStretched) {
// Stretching only in the horizontal.
- if (pinnedInDirection(0, deltaY)) {
+ if (m_scrollElasticityController.m_client->pinnedInDirection(FloatSize(0, deltaY))) {
if (deltaX != 0 && (fabsf(deltaY / deltaX) < rubberbandDirectionLockStretchRatio))
deltaY = 0;
else if (fabsf(deltaY) < rubberbandMinimumRequiredDeltaBeforeStretch) {
@@ -1173,7 +1173,7 @@
}
} else {
// Not stretching at all yet.
- if (pinnedInDirection(deltaX, deltaY)) {
+ if (m_scrollElasticityController.m_client->pinnedInDirection(FloatSize(deltaX, deltaY))) {
if (fabsf(deltaY) >= fabsf(deltaX)) {
if (fabsf(deltaX) < rubberbandMinimumRequiredDeltaBeforeStretch) {
m_scrollElasticityController.m_overflowScrollDelta.setWidth(m_scrollElasticityController.m_overflowScrollDelta.width() + deltaX);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
