Changeset 143335 in webkit

Timestamp:

Feb 19, 2013 8:26:25 AM (11 years ago)

Author:

abecsi@webkit.org

Message:

[Qt][WK2] ASSERT(node) hit in WebPage::findZoomableAreaForPoint if no zoomable area found
​https://bugs.webkit.org/show_bug.cgi?id=110220

Reviewed by Allan Sandfeld Jensen.

If EventHandler::bestZoomableAreaForTouchPoint was unsuccessfull, eg.
no node was found for a given point, we hit ASSERT(node).
We should only assert for a valid node if a zoomable area was found.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::findZoomableAreaForPoint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-19  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt][WK2] ASSERT(node) hit in WebPage::findZoomableAreaForPoint if no zoomable area found
+        https://bugs.webkit.org/show_bug.cgi?id=110220
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        If EventHandler::bestZoomableAreaForTouchPoint was unsuccessfull, eg.
+        no node was found for a given point, we hit ASSERT(node).
+        We should only assert for a valid node if a zoomable area was found.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::findZoomableAreaForPoint):
+
 2013-02-19  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -3016 +3016 @@
     IntRect zoomableArea;
     bool foundAreaForTouchPoint = m_mainFrame->coreFrame()->eventHandler()->bestZoomableAreaForTouchPoint(point, IntSize(area.width() / 2, area.height() / 2), zoomableArea, node);
+
+    if (!foundAreaForTouchPoint)
+        return;
+
     ASSERT(node);
-
-    if (!foundAreaForTouchPoint)
-        return;
 
     if (node->document() && node->document()->view())