Title: [90829] trunk/Source/WebKit2
- Revision
- 90829
- Author
- [email protected]
- Date
- 2011-07-12 11:13:41 -0700 (Tue, 12 Jul 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90828 => 90829)
--- trunk/Source/WebKit2/ChangeLog 2011-07-12 18:06:13 UTC (rev 90828)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-12 18:13:41 UTC (rev 90829)
@@ -1,5 +1,18 @@
2011-07-12 Andreas Kling <[email protected]>
+ [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 <[email protected]>
+
[Qt][WK2] Add informative loadFailed() signal to web views.
https://bugs.webkit.org/show_bug.cgi?id=64362
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (90828 => 90829)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-12 18:06:13 UTC (rev 90828)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-12 18:13:41 UTC (rev 90829)
@@ -467,7 +467,6 @@
void QtWebPageProxy::paint(QPainter* painter, QRect area)
{
- ASSERT(m_webPageProxy->drawingArea());
if (m_webPageProxy->isValid())
paintContent(painter, area);
else
@@ -585,7 +584,8 @@
void QtWebPageProxy::setDrawingAreaSize(const QSize& size)
{
- ASSERT(m_webPageProxy->drawingArea());
+ if (!m_webPageProxy->drawingArea())
+ return;
m_webPageProxy->drawingArea()->setSize(IntSize(size), IntSize());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
