Changeset 162188 in webkit

Timestamp:

Jan 16, 2014 11:19:56 PM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Remove the weak pointer added to the web view in WebKitPrintOperation
​https://bugs.webkit.org/show_bug.cgi?id=127098

Reviewed by Martin Robinson.

If the print operation finishes and the web view is still alive,
the weak pointer added to the view should be removed.

• UIProcess/API/gtk/WebKitPrintOperation.cpp:

(_WebKitPrintOperationPrivate::~_WebKitPrintOperationPrivate):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Remove the weak pointer added to the web view in WebKitPrintOperation
+        https://bugs.webkit.org/show_bug.cgi?id=127098
+
+        Reviewed by Martin Robinson.
+
+        If the print operation finishes and the web view is still alive,
+        the weak pointer added to the view should be removed.
+
+        * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+        (_WebKitPrintOperationPrivate::~_WebKitPrintOperationPrivate):
+
 2014-01-15  Sam Weinig  <sam@webkit.org>
 

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

@@ -66 +66 @@
 
 struct _WebKitPrintOperationPrivate {
+    ~_WebKitPrintOperationPrivate()
+    {
+        if (webView)
+            g_object_remove_weak_pointer(G_OBJECT(webView), reinterpret_cast<void**>(&webView));
+    }
+
     WebKitWebView* webView;
     PrintInfo::PrintMode printMode;
@@ -79 +85 @@
 static void webkitPrintOperationConstructed(GObject* object)
 {
-    WebKitPrintOperation* printOperation = WEBKIT_PRINT_OPERATION(object);
-    WebKitPrintOperationPrivate* priv = printOperation->priv;
-
-    if (G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed)
-        G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed(object);
-
-    g_object_add_weak_pointer(G_OBJECT(priv->webView), (gpointer*)&priv->webView);
+    G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed(object);
+
+    WebKitPrintOperationPrivate* priv = WEBKIT_PRINT_OPERATION(object)->priv;
+    g_object_add_weak_pointer(G_OBJECT(priv->webView), reinterpret_cast<void**>(&priv->webView));
 }