Changeset 100474 in webkit

Timestamp:

Nov 16, 2011, 11:13:25 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add minimum/maximumPageScaleFactor API and clamp fixes
​https://bugs.webkit.org/show_bug.cgi?id=72463

Patch by Alexandre Elias <​aelias@google.com> on 2011-11-16
Reviewed by Darin Fisher.

We need a way to read back the computed min/max page scale factor in
order to support the software path, and for some application logic
such as zooming in/out when tapping form fields.

I also added a few clamp calls that are needed in some corner cases.

• public/WebView.h:
• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setPageScaleFactor):
(WebKit::WebViewImpl::setPageScaleFactorLimits):
(WebKit::WebViewImpl::minimumPageScaleFactor):
(WebKit::WebViewImpl::maximumPageScaleFactor):

• src/WebViewImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebView.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (2 diffs)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-16  Alexandre Elias  <aelias@google.com>
+
+        [chromium] Add minimum/maximumPageScaleFactor API and clamp fixes
+        https://bugs.webkit.org/show_bug.cgi?id=72463
+
+        Reviewed by Darin Fisher.
+
+        We need a way to read back the computed min/max page scale factor in
+        order to support the software path, and for some application logic
+        such as zooming in/out when tapping form fields.
+
+        I also added a few clamp calls that are needed in some corner cases.
+
+        * public/WebView.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setPageScaleFactor):
+        (WebKit::WebViewImpl::setPageScaleFactorLimits):
+        (WebKit::WebViewImpl::minimumPageScaleFactor):
+        (WebKit::WebViewImpl::maximumPageScaleFactor):
+        * src/WebViewImpl.h:
+
 2011-11-16  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebView.h

@@ -228 +228 @@
     virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale) = 0;
 
+    virtual float minimumPageScaleFactor() const = 0;
+    virtual float maximumPageScaleFactor() const = 0;
+
     // The ratio of the current device's screen DPI to the target device's screen DPI.
     virtual float deviceScaleFactor() const = 0;

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

@@ -1904 +1904 @@
 
     scaleFactor = computePageScaleFactorWithinLimits(scaleFactor);
-    page()->setPageScaleFactor(scaleFactor, origin);
+    WebPoint clampedOrigin = clampOffsetAtScale(origin, scaleFactor);
+    page()->setPageScaleFactor(scaleFactor, clampedOrigin);
 }
 
@@ -1969 +1970 @@
         m_layerTreeHost->setPageScaleFactorLimits(m_minimumPageScaleFactor, m_maximumPageScaleFactor);
 #endif
+
+    float clampedScale = computePageScaleFactorWithinLimits(pageScaleFactor());
+    if (clampedScale != pageScaleFactor())
+        setPageScaleFactorPreservingScrollOffset(clampedScale);
+}
+
+float WebViewImpl::minimumPageScaleFactor() const
+{
+    return m_minimumPageScaleFactor;
+}
+
+float WebViewImpl::maximumPageScaleFactor() const
+{
+    return m_maximumPageScaleFactor;
 }
 

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

@@ -162 +162 @@
     virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin);
     virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale);
+    virtual float minimumPageScaleFactor() const;
+    virtual float maximumPageScaleFactor() const;
+
     virtual float deviceScaleFactor() const;
     virtual void setDeviceScaleFactor(float);