Title: [120233] trunk/Source/WebKit2
- Revision
- 120233
- Author
- abe...@webkit.org
- Date
- 2012-06-13 12:09:21 -0700 (Wed, 13 Jun 2012)
Log Message
[Qt][WK2] ASSERT(m_rawAttributes.initialScale > 0) in QtViewportHandler::initialRect()
https://bugs.webkit.org/show_bug.cgi?id=89026
Reviewed by Csaba Osztrogonác.
Only act on viewport attribute changes if the layout size is valid.
* UIProcess/qt/QtViewportHandler.cpp:
(WebKit::QtViewportHandler::setInitialScaleIfNeeded):
(WebKit::QtViewportHandler::viewportAttributesChanged):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (120232 => 120233)
--- trunk/Source/WebKit2/ChangeLog 2012-06-13 19:08:13 UTC (rev 120232)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-13 19:09:21 UTC (rev 120233)
@@ -1,3 +1,16 @@
+2012-06-13 Andras Becsi <andras.be...@nokia.com>
+
+ [Qt][WK2] ASSERT(m_rawAttributes.initialScale > 0) in QtViewportHandler::initialRect()
+ https://bugs.webkit.org/show_bug.cgi?id=89026
+
+ Reviewed by Csaba Osztrogonác.
+
+ Only act on viewport attribute changes if the layout size is valid.
+
+ * UIProcess/qt/QtViewportHandler.cpp:
+ (WebKit::QtViewportHandler::setInitialScaleIfNeeded):
+ (WebKit::QtViewportHandler::viewportAttributesChanged):
+
2012-06-13 Brent Fulgham <bfulg...@webkit.org>
[WinCairo] Build fix after Windows export definition file change.
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp (120232 => 120233)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp 2012-06-13 19:08:13 UTC (rev 120232)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp 2012-06-13 19:09:21 UTC (rev 120233)
@@ -202,7 +202,7 @@
void QtViewportHandler::setInitialScaleIfNeeded()
{
- if (m_rawAttributes.initialScale < 0)
+ if (m_rawAttributes.layoutSize.isEmpty() || m_rawAttributes.initialScale < 0)
return;
m_zoomOutScale = 0.0;
@@ -219,6 +219,9 @@
void QtViewportHandler::viewportAttributesChanged(const WebCore::ViewportAttributes& newAttributes)
{
+ if (newAttributes.layoutSize.isEmpty())
+ return;
+
m_rawAttributes = newAttributes;
WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
