[Qt] [WK2] Division by zero error in QtViewportInteractionEngine::setItemRectVisible

https://bugs.webkit.org/show_bug.cgi?id=76674

Reviewed by Kenneth Rohde Christiansen.

Make sure that itemRect is not empty.

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::setItemRectVisible):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 93ce289..69e5b57 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-20  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        [Qt] [WK2] Division by zero error in QtViewportInteractionEngine::setItemRectVisible
+        https://bugs.webkit.org/show_bug.cgi?id=76674
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Make sure that itemRect is not empty.
+
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::QtViewportInteractionEngine::setItemRectVisible):
+
 2012-01-20  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by Alexey Proskuryakov.

diff --git a/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp b/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
index d12eb0b..87cb9db 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
@@ -173,6 +173,9 @@ qreal QtViewportInteractionEngine::outerBoundedCSSScale(qreal cssScale)
 
 void QtViewportInteractionEngine::setItemRectVisible(const QRectF& itemRect)
 {
+    if (itemRect.isEmpty())
+        return;
+
     ViewportUpdateDeferrer guard(this);
 
     qreal itemScale = m_viewport->width() / itemRect.width();