Changeset 88646 in webkit

Timestamp:

Jun 13, 2011 10:14:36 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-06-13 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Fix a crash when drawing area has been deleted
​https://bugs.webkit.org/show_bug.cgi?id=62541

Check whether WebPageProxy::drawingArea() returns a valid pointer
before using it, it might be null, for example, when the web
process crashes.

• UIProcess/API/gtk/WebKitWebViewBase.cpp: (callDrawingAreaPaintMethod): (webkitWebViewBaseSizeAllocate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix a crash when drawing area has been deleted
+        https://bugs.webkit.org/show_bug.cgi?id=62541
+
+        Check whether WebPageProxy::drawingArea() returns a valid pointer
+        before using it, it might be null, for example, when the web
+        process crashes.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (callDrawingAreaPaintMethod):
+        (webkitWebViewBaseSizeAllocate):
+
 2011-06-13  Eunmi Lee  <eunmi15.lee@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -154 +154 @@
 static void callDrawingAreaPaintMethod(DrawingAreaProxy* drawingArea, cairo_t* context, const IntRect& area)
 {
+    if (!drawingArea)
+        return;
+
     WebKit::Region unpaintedRegion; // This is simply unused.
     static_cast<DrawingAreaProxyImpl*>(drawingArea)->paint(context, area, unpaintedRegion);
@@ -184 +187 @@
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
+
+    if (!priv->pageProxy->drawingArea())
+        return;
 
     GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->size_allocate(widget, allocation);