[iOS WK2] Fix assertion in ViewportConfiguration::setDefaultConfiguration seen in...

https://bugs.webkit.org/show_bug.cgi?id=149959

Reviewed by Tim Horton.

When loading tests which set a flexible viewport, ViewportConfiguration::setDefaultConfiguration()
is called first with testingParameters() and then with webpageParameters(). This
would trigger the assertion that m_defaultConfiguration.initialScaleIsSet but
the new initial scale is zero.

The assertion seems wrong anyway; it's consulting m_defaultConfiguration.initialScaleIsSet
but defaultConfiguration.initialScale, so fix it to test defaultConfiguration.initialScaleIsSet.

* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::setDefaultConfiguration):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index fadb53c4c30eef3e5782a78fd71d7247b6362fe5..c4a327d646557614c22d6dccd37462bf8c581a30 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2015-10-09  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Fix assertion in ViewportConfiguration::setDefaultConfiguration seen in testing
+        https://bugs.webkit.org/show_bug.cgi?id=149959
+
+        Reviewed by Tim Horton.
+
+        When loading tests which set a flexible viewport, ViewportConfiguration::setDefaultConfiguration()
+        is called first with testingParameters() and then with webpageParameters(). This
+        would trigger the assertion that m_defaultConfiguration.initialScaleIsSet but
+        the new initial scale is zero.
+        
+        The assertion seems wrong anyway; it's consulting m_defaultConfiguration.initialScaleIsSet
+        but defaultConfiguration.initialScale, so fix it to test defaultConfiguration.initialScaleIsSet.
+
+        * page/ViewportConfiguration.cpp:
+        (WebCore::ViewportConfiguration::setDefaultConfiguration):
+
 2015-10-09  Csaba Osztrogonác  <ossy@webkit.org>
 
         Fix the !ENABLE(STREAM_API) build after r190794

diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp
index 8d3397ff513593dfee5fa3c5a798d2de070f7046..0c411b4d7e65fe11b1942327fb020908f58c8cd6 100644 (file)
--- a/Source/WebCore/page/ViewportConfiguration.cpp
+++ b/Source/WebCore/page/ViewportConfiguration.cpp
@@ -58,7 +58,7 @@ ViewportConfiguration::ViewportConfiguration()
 void ViewportConfiguration::setDefaultConfiguration(const ViewportConfiguration::Parameters& defaultConfiguration)
 {
     ASSERT(!constraintsAreAllRelative(m_configuration));
-    ASSERT(!m_defaultConfiguration.initialScaleIsSet || defaultConfiguration.initialScale > 0);
+    ASSERT(!defaultConfiguration.initialScaleIsSet || defaultConfiguration.initialScale > 0);
     ASSERT(defaultConfiguration.minimumScale > 0);
     ASSERT(defaultConfiguration.maximumScale >= defaultConfiguration.minimumScale);