Title: [135504] trunk/Source/WebKit2
- Revision
- 135504
- Author
- [email protected]
- Date
- 2012-11-22 04:14:59 -0800 (Thu, 22 Nov 2012)
Log Message
REGRESSION(r135399): Wrong assertion causing an assertion failure: m_rawAttributes.initialScale > 0
https://bugs.webkit.org/show_bug.cgi?id=102971
Patch by Mikhail Pozdnyakov <[email protected]> on 2012-11-22
Reviewed by Kenneth Rohde Christiansen.
m_rawAttributes.initialScale has to be initialized even if m_minimumScaleToFit hasn't changed
it's value.
* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::didChangeViewportAttributes):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135503 => 135504)
--- trunk/Source/WebKit2/ChangeLog 2012-11-22 11:59:08 UTC (rev 135503)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-22 12:14:59 UTC (rev 135504)
@@ -1,3 +1,16 @@
+2012-11-22 Mikhail Pozdnyakov <[email protected]>
+
+ REGRESSION(r135399): Wrong assertion causing an assertion failure: m_rawAttributes.initialScale > 0
+ https://bugs.webkit.org/show_bug.cgi?id=102971
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ m_rawAttributes.initialScale has to be initialized even if m_minimumScaleToFit hasn't changed
+ it's value.
+
+ * UIProcess/PageViewportController.cpp:
+ (WebKit::PageViewportController::didChangeViewportAttributes):
+
2012-11-22 Eunmi Lee <[email protected]>
[EFL][WK2] Correct the parameters of WebPlatformTouchPoint.
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (135503 => 135504)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-11-22 11:59:08 UTC (rev 135503)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2012-11-22 12:14:59 UTC (rev 135504)
@@ -219,8 +219,7 @@
m_rawAttributes = newAttributes;
m_allowsUserScaling = !!m_rawAttributes.userScalable;
- if (!updateMinimumScaleToFit())
- return;
+ bool minimumScaleUpdated = updateMinimumScaleToFit();
ASSERT(m_minimumScaleToFit > 0);
@@ -230,7 +229,8 @@
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);
- m_client->didChangeViewportAttributes();
+ if (minimumScaleUpdated)
+ m_client->didChangeViewportAttributes();
}
WebCore::FloatSize PageViewportController::viewportSizeInContentsCoordinates() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
