Changeset 127704 in webkit

Timestamp:

Sep 6, 2012 12:35:43 AM (12 years ago)

Author:

abarth@webkit.org

Message:

Chromium should call restrictScaleFactorToInitialScaleIfNotUserScalable unless/until userScalable is supported directly.
​https://bugs.webkit.org/show_bug.cgi?id=91110

Reviewed by Tony Chang.

Source/WebKit/chromium:

Prior to this patch, we were ignoring the user-scalable property of
viewport meta tags. This patch enforces the user-scalable property by
claming the minimum-scale and maximum-scale values, effectively
preventing user scaling. This approach isn't perfect, as discussed in
​https://bugs.webkit.org/show_bug.cgi?id=70609, but it is an improvement
over the status quo.

This approach is also used by EFL, GTK, and Qt.

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):

LayoutTests:

Test that the scale limits are clamped when user-scalable is set to no.

• fast/viewport/viewport-limits-adjusted-for-no-user-scale-control-expected.txt: Added.
• fast/viewport/viewport-limits-adjusted-for-no-user-scale-control.html: Added.
• fast/viewport/viewport-limits-adjusted-for-no-user-scale-expected.txt: Added.
• fast/viewport/viewport-limits-adjusted-for-no-user-scale.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/viewport/viewport-limits-adjusted-for-no-user-scale-control-expected.txt (added)
• LayoutTests/fast/viewport/viewport-limits-adjusted-for-no-user-scale-control.html (added)
• LayoutTests/fast/viewport/viewport-limits-adjusted-for-no-user-scale-expected.txt (added)
• LayoutTests/fast/viewport/viewport-limits-adjusted-for-no-user-scale.html (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-06  Adam Barth  <abarth@webkit.org>
+
+        Chromium should call restrictScaleFactorToInitialScaleIfNotUserScalable unless/until userScalable is supported directly.
+        https://bugs.webkit.org/show_bug.cgi?id=91110
+
+        Reviewed by Tony Chang.
+
+        Test that the scale limits are clamped when user-scalable is set to no.
+
+        * fast/viewport/viewport-limits-adjusted-for-no-user-scale-control-expected.txt: Added.
+        * fast/viewport/viewport-limits-adjusted-for-no-user-scale-control.html: Added.
+        * fast/viewport/viewport-limits-adjusted-for-no-user-scale-expected.txt: Added.
+        * fast/viewport/viewport-limits-adjusted-for-no-user-scale.html: Added.
+
 2012-09-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-06  Adam Barth  <abarth@webkit.org>
+
+        Chromium should call restrictScaleFactorToInitialScaleIfNotUserScalable unless/until userScalable is supported directly.
+        https://bugs.webkit.org/show_bug.cgi?id=91110
+
+        Reviewed by Tony Chang.
+
+        Prior to this patch, we were ignoring the user-scalable property of
+        viewport meta tags. This patch enforces the user-scalable property by
+        claming the minimum-scale and maximum-scale values, effectively
+        preventing user scaling. This approach isn't perfect, as discussed in
+        https://bugs.webkit.org/show_bug.cgi?id=70609, but it is an improvement
+        over the status quo.
+
+        This approach is also used by EFL, GTK, and Qt.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+
 2012-09-05  Dana Jansens  <danakj@chromium.org>
 

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

@@ -654 +654 @@
         dpi / ViewportArguments::deprecatedTargetDPI, IntSize(deviceRect.width, deviceRect.height));
 
+    restrictScaleFactorToInitialScaleIfNotUserScalable(computed);
+
     if (m_webView->ignoreViewportTagMaximumScale()) {
         computed.maximumScale = max(computed.maximumScale, m_webView->maxPageScaleFactor);