Changeset 162057 in webkit

Timestamp:

Jan 14, 2014 11:56:42 PM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] UI process crashes when closing the window right after printing with javascript
​https://bugs.webkit.org/show_bug.cgi?id=126981

Reviewed by Gustavo Noronha Silva.

The UI process crashes because when the page is closed, the web
view is destroyed before the print operation has actually
finished. Use a weak pointer to make sure the web view pointer is
set to NULL when the it's destroyed and emit the finished callback
always so that the user can clean up the operation even when the
web view has been closed.

• UIProcess/API/gtk/WebKitPrintOperation.cpp:

(drawPagesForPrintingCompleted):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitPrintOperation.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] UI process crashes when closing the window right after printing with javascript
+        https://bugs.webkit.org/show_bug.cgi?id=126981
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The UI process crashes because when the page is closed, the web
+        view is destroyed before the print operation has actually
+        finished. Use a weak pointer to make sure the web view pointer is
+        set to NULL when the it's destroyed and emit the finished callback
+        always so that the user can clean up the operation even when the
+        web view has been closed.
+
+        * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+        (drawPagesForPrintingCompleted):
+
 2014-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -66 +66 @@
 
 struct _WebKitPrintOperationPrivate {
-    ~_WebKitPrintOperationPrivate()
-    {
-        g_signal_handler_disconnect(webView, webViewDestroyedId);
-    }
-
     WebKitWebView* webView;
-    gulong webViewDestroyedId;
     PrintInfo::PrintMode printMode;
 
@@ -83 +77 @@
 WEBKIT_DEFINE_TYPE(WebKitPrintOperation, webkit_print_operation, G_TYPE_OBJECT)
 
-static void webViewDestroyed(GtkWidget* webView, GObject* printOperation)
-{
-    g_object_unref(printOperation);
-}
-
 static void webkitPrintOperationConstructed(GObject* object)
 {
@@ -96 +85 @@
         G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed(object);
 
-    priv->webViewDestroyedId = g_signal_connect(priv->webView, "destroy", G_CALLBACK(webViewDestroyed), printOperation);
+    g_object_add_weak_pointer(G_OBJECT(priv->webView), (gpointer*)&priv->webView);
 }
 
@@ -264 +253 @@
 {
     GRefPtr<WebKitPrintOperation> printOperation = adoptGRef(WEBKIT_PRINT_OPERATION(context));
-    WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));
 
     // When running synchronously WebPageProxy::printFrame() calls endPrinting().
-    if (printOperation->priv->printMode == PrintInfo::PrintModeAsync)
+    if (printOperation->priv->printMode == PrintInfo::PrintModeAsync && printOperation->priv->webView) {
+        WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));
         page->endPrinting();
+    }
 
     const WebCore::ResourceError& resourceError = wkPrintError ? toImpl(wkPrintError)->platformError() : WebCore::ResourceError();