Title: [121769] trunk/Source/WebKit2
- Revision
- 121769
- Author
- [email protected]
- Date
- 2012-07-03 08:34:54 -0700 (Tue, 03 Jul 2012)
Log Message
[Qt][WK2] API tests randomly asserts in QQuickWebPage::setContentsScale(qreal)
https://bugs.webkit.org/show_bug.cgi?id=88679
Reviewed by Csaba Osztrogonác.
Viewport parameters cannot be calculated while viewport is not visible and
viewport size is 0, so let's delay calculation of viewport parameters until view
becomes visible.
* UIProcess/qt/QtViewportHandler.cpp:
(WebKit::QtViewportHandler::pageContentsSizeChanged):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (121768 => 121769)
--- trunk/Source/WebKit2/ChangeLog 2012-07-03 15:28:09 UTC (rev 121768)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-03 15:34:54 UTC (rev 121769)
@@ -1,3 +1,17 @@
+2012-07-03 Viatcheslav Ostapenko <[email protected]>
+
+ [Qt][WK2] API tests randomly asserts in QQuickWebPage::setContentsScale(qreal)
+ https://bugs.webkit.org/show_bug.cgi?id=88679
+
+ Reviewed by Csaba Osztrogonác.
+
+ Viewport parameters cannot be calculated while viewport is not visible and
+ viewport size is 0, so let's delay calculation of viewport parameters until view
+ becomes visible.
+
+ * UIProcess/qt/QtViewportHandler.cpp:
+ (WebKit::QtViewportHandler::pageContentsSizeChanged):
+
2012-07-03 Tor Arne Vestbø <[email protected]>
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp (121768 => 121769)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp 2012-07-03 15:28:09 UTC (rev 121768)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp 2012-07-03 15:34:54 UTC (rev 121769)
@@ -238,6 +238,9 @@
void QtViewportHandler::pageContentsSizeChanged(const QSize& newSize, const QSize& viewportSize)
{
+ if (viewportSize.isEmpty())
+ return;
+
float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, viewportSize, newSize);
if (!qFuzzyCompare(minimumScale, m_rawAttributes.minimumScale)) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
