[Qt][WK2] ASSERT(m_rawAttributes.initialScale > 0) in QtViewportHandl…

…er::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):

Canonical link: https://commits.webkit.org/106853@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120233 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,16 @@
+2012-06-13  Andras Becsi  <andras.becsi@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  <bfulgham@webkit.org>
 
         [WinCairo] Build fix after Windows export definition file change.

Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp

@@ -202,7 +202,7 @@ qreal QtViewportHandler::outerBoundedCSSScale(qreal cssScale) const
 
 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::setInitialScaleIfNeeded()
 
 void QtViewportHandler::viewportAttributesChanged(const WebCore::ViewportAttributes& newAttributes)
 {
+    if (newAttributes.layoutSize.isEmpty())
+        return;
+
     m_rawAttributes = newAttributes;
     WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);