[iOS WK2] Fix assertion in ViewportConfiguration::setDefaultConfiguration seen in...
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Oct 2015 18:36:49 +0000 (18:36 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Oct 2015 18:36:49 +0000 (18:36 +0000)
commit38d6d06b4ff9ddc841ccd63a9ec7f9b5f60fd26d
tree8b252388e6fe01f4c3c73f2a4208befd8e951e6e
parente869e4f3cfc93df288b6cc36b733d19c0f580933
[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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/page/ViewportConfiguration.cpp