Changeset 124288 in webkit

Timestamp:

Jul 31, 2012, 7:55:55 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android
​https://bugs.webkit.org/show_bug.cgi?id=92698

Patch by Yusuf Ozuysal <​yusufo@google.com> on 2012-07-31
Reviewed by Adam Barth.

Enforce the maximum and minimum scroll positions after the scale has changed.

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::startPageScaleAnimation):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-07-31  Yusuf Ozuysal  <yusufo@google.com>
+
+        [chromium]Upstream WebViewImpl:StartPageScaleAnimation changes for Chrome for Android
+        https://bugs.webkit.org/show_bug.cgi?id=92698
+
+        Reviewed by Adam Barth.
+
+        Enforce the maximum and minimum scroll positions after the scale has changed.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::startPageScaleAnimation):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2012-07-31  Terry Anderson  <tdanderson@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -779 +779 @@
 }
 
-void WebViewImpl::startPageScaleAnimation(const IntPoint& scroll, bool useAnchor, float newScale, double durationInSeconds)
-{
-    if (!m_layerTreeView.isNull())
-        m_layerTreeView.startPageScaleAnimation(scroll, useAnchor, newScale, durationInSeconds);
+void WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, bool useAnchor, float newScale, double durationInSeconds)
+{
+    if (m_layerTreeView.isNull())
+        return;
+
+    IntPoint clampedPoint = targetPosition;
+    if (!useAnchor)
+        clampedPoint = clampOffsetAtScale(targetPosition, newScale);
+
+    if (!durationInSeconds && !useAnchor) {
+        setPageScaleFactor(newScale, clampedPoint);
+        return;
+    }
+
+    m_layerTreeView.startPageScaleAnimation(targetPosition, useAnchor, newScale, durationInSeconds);
 }
 #endif