Title: [168136] trunk/Source/WebCore
Revision
168136
Author
benja...@webkit.org
Date
2014-05-01 16:59:43 -0700 (Thu, 01 May 2014)

Log Message

ViewportConfiguration::minimumScale() uses the initial scale as initial value
https://bugs.webkit.org/show_bug.cgi?id=132451
<rdar://problem/16780111>

Patch by Benjamin Poulain <bpoul...@apple.com> on 2014-05-01
Reviewed by Enrica Casucci.

* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::minimumScale):
The initial minimum scale was set to the initial scale, preventing some pages from zooming
out.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (168135 => 168136)


--- trunk/Source/WebCore/ChangeLog	2014-05-01 23:59:06 UTC (rev 168135)
+++ trunk/Source/WebCore/ChangeLog	2014-05-01 23:59:43 UTC (rev 168136)
@@ -1,3 +1,16 @@
+2014-05-01  Benjamin Poulain  <bpoul...@apple.com>
+
+        ViewportConfiguration::minimumScale() uses the initial scale as initial value
+        https://bugs.webkit.org/show_bug.cgi?id=132451
+        <rdar://problem/16780111>
+
+        Reviewed by Enrica Casucci.
+
+        * page/ViewportConfiguration.cpp:
+        (WebCore::ViewportConfiguration::minimumScale):
+        The initial minimum scale was set to the initial scale, preventing some pages from zooming
+        out.
+
 2014-05-01  Alexey Proskuryakov  <a...@apple.com>
 
         Build fix for !ENABLE(BLOB) builds.

Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (168135 => 168136)


--- trunk/Source/WebCore/page/ViewportConfiguration.cpp	2014-05-01 23:59:06 UTC (rev 168135)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp	2014-05-01 23:59:43 UTC (rev 168136)
@@ -124,7 +124,7 @@
         return initialScale();
 
     // If not, we still need to sanity check our value.
-    double minimumScale = m_configuration.initialScale;
+    double minimumScale = m_configuration.minimumScale;
 
     double contentWidth = m_contentSize.width();
     if (contentWidth > 0 && contentWidth * minimumScale < m_minimumLayoutSize.width())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to