Title: [152637] releases/WebKitGTK/webkit-2.0/Source/WebKit2
Revision
152637
Author
[email protected]
Date
2013-07-15 09:24:51 -0700 (Mon, 15 Jul 2013)

Log Message

Merge r152626 - [WK2][GTK] SIGSEV in webkitWebViewBaseSizeAllocate
https://bugs.webkit.org/show_bug.cgi?id=118052

Patch by Alberto Garcia <[email protected]> on 2013-07-15
Reviewed by Carlos Garcia Campos.

We don't need to check whether the drawing area is empty or not in
order to set needsResizeOnMap.

It can also happen that the drawing area pointer is null (if
e.g. the web process crashes), which is the reason for this
SIGSEGV.

A test to prevent this was added in r88646 but was later moved to
resizeWebKitWebViewBaseFromAllocation().

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseSizeAllocate):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (152636 => 152637)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-07-15 16:21:20 UTC (rev 152636)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-07-15 16:24:51 UTC (rev 152637)
@@ -1,3 +1,23 @@
+2013-07-15  Alberto Garcia  <[email protected]>
+
+        [WK2][GTK] SIGSEV in webkitWebViewBaseSizeAllocate
+        https://bugs.webkit.org/show_bug.cgi?id=118052
+
+        Reviewed by Carlos Garcia Campos.
+
+        We don't need to check whether the drawing area is empty or not in
+        order to set needsResizeOnMap.
+
+        It can also happen that the drawing area pointer is null (if
+        e.g. the web process crashes), which is the reason for this
+        SIGSEGV.
+
+        A test to prevent this was added in r88646 but was later moved to
+        resizeWebKitWebViewBaseFromAllocation().
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseSizeAllocate):
+
 2013-07-03  Sergio Villar Senin  <[email protected]>
 
         [GTK][WK2] SIGSEV in WebKit::WebPageContextMenuClient::customContextMenuItemSelected

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (152636 => 152637)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2013-07-15 16:21:20 UTC (rev 152636)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2013-07-15 16:24:51 UTC (rev 152637)
@@ -510,7 +510,7 @@
     GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->size_allocate(widget, allocation);
 
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
-    if (sizeChanged && !gtk_widget_get_mapped(widget) && !webViewBase->priv->pageProxy->drawingArea()->size().isEmpty()) {
+    if (sizeChanged && !gtk_widget_get_mapped(widget)) {
         webViewBase->priv->needsResizeOnMap = true;
         return;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to