Changeset 167318 in webkit

Timestamp:

Apr 15, 2014 11:42:14 AM (10 years ago)

Author:

benjamin@webkit.org

Message:

ViewportConfiguration handles userZoom incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=131657

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-04-15
Reviewed by Darin Adler.

• page/ViewportConfiguration.cpp:

(WebCore::viewportArgumentUserZoomIsSet):
(WebCore::ViewportConfiguration::updateConfiguration):
The other viewport values must be strictly positive, userZoom is always either zero, one or minus one.
As a result, the value zero was never set.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ViewportConfiguration.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-15  Benjamin Poulain  <bpoulain@apple.com>
+
+        ViewportConfiguration handles userZoom incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=131657
+
+        Reviewed by Darin Adler.
+
+        * page/ViewportConfiguration.cpp:
+        (WebCore::viewportArgumentUserZoomIsSet):
+        (WebCore::ViewportConfiguration::updateConfiguration):
+        The other viewport values must be strictly positive, userZoom is always either zero, one or minus one.
+        As a result, the value zero was never set.
+
 2014-04-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/ViewportConfiguration.cpp

@@ -210 +210 @@
 }
 
+static inline bool viewportArgumentUserZoomIsSet(float value)
+{
+    return !value || value == 1;
+}
+
 void ViewportConfiguration::updateConfiguration()
 {
@@ -236 +241 @@
     }
 
-    if (viewportArgumentValueIsValid(m_viewportArguments.userZoom))
+    if (viewportArgumentUserZoomIsSet(m_viewportArguments.userZoom))
         m_configuration.allowsUserScaling = m_viewportArguments.userZoom != 0.;
 }