Title: [190810] trunk/Source/WebCore
- Revision
- 190810
- Author
- [email protected]
- Date
- 2015-10-09 11:36:49 -0700 (Fri, 09 Oct 2015)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190809 => 190810)
--- trunk/Source/WebCore/ChangeLog 2015-10-09 17:54:16 UTC (rev 190809)
+++ trunk/Source/WebCore/ChangeLog 2015-10-09 18:36:49 UTC (rev 190810)
@@ -1,3 +1,21 @@
+2015-10-09 Simon Fraser <[email protected]>
+
+ [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 <[email protected]>
Fix the !ENABLE(STREAM_API) build after r190794
Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (190809 => 190810)
--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-10-09 17:54:16 UTC (rev 190809)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-10-09 18:36:49 UTC (rev 190810)
@@ -58,7 +58,7 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
