Changeset 90829 in webkit

Timestamp:

Jul 12, 2011, 11:13:41 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

[Qt][WK2] QDesktopWebView crashes if resized without web process.
​https://bugs.webkit.org/show_bug.cgi?id=64371

Reviewed by Benjamin Poulain.

• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::paint): Remove an invalid assertion. The drawing
area may be null if the web process has crashed.
(QtWebPageProxy::setDrawingAreaSize): Fail silently if there is no
drawing area.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-12  Andreas Kling  <kling@webkit.org>
+
+        [Qt][WK2] QDesktopWebView crashes if resized without web process.
+        https://bugs.webkit.org/show_bug.cgi?id=64371
+
+        Reviewed by Benjamin Poulain.
+
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::paint): Remove an invalid assertion. The drawing
+        area may be null if the web process has crashed.
+        (QtWebPageProxy::setDrawingAreaSize): Fail silently if there is no
+        drawing area.
+
 2011-07-12  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

@@ -468 +468 @@
 void QtWebPageProxy::paint(QPainter* painter, QRect area)
 {
-    ASSERT(m_webPageProxy->drawingArea());
     if (m_webPageProxy->isValid())
         paintContent(painter, area);
@@ -586 +585 @@
 void QtWebPageProxy::setDrawingAreaSize(const QSize& size)
 {
-    ASSERT(m_webPageProxy->drawingArea());
+    if (!m_webPageProxy->drawingArea())
+        return;
     m_webPageProxy->drawingArea()->setSize(IntSize(size), IntSize());
 }