[iOS WK2] Fix assertion in ViewportConfiguration::setDefaultConfiguration seen in...
[WebKit-https.git] / Source / WebCore / ChangeLog
index fadb53c..c4a327d 100644 (file)
@@ -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