Changeset 261276 in webkit

Timestamp:

May 7, 2020 2:05:36 AM (4 years ago)

Author:

Adrian Perez de Castro

Message:

[GTK4] Stop using the GtkWidget.destroy vfunc
​https://bugs.webkit.org/show_bug.cgi?id=211553

Reviewed by Carlos Garcia Campos.

No new tests needed.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseDestroy): Removed.
(webkitWebViewBaseDispose): Bring in the code from the removed function, adapt
to use g_clear_pointer() to destroy the nested dialog.
(webkit_web_view_base_class_init): Do not set the GtkWidget.destroy vfunc.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-07  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK4] Stop using the GtkWidget.destroy vfunc
+        https://bugs.webkit.org/show_bug.cgi?id=211553
+
+        Reviewed by Carlos Garcia Campos.
+
+        No new tests needed.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseDestroy): Removed.
+        (webkitWebViewBaseDispose): Bring in the code from the removed function, adapt
+        to use g_clear_pointer() to destroy the nested dialog.
+        (webkit_web_view_base_class_init): Do not set the GtkWidget.destroy vfunc.
+
 2020-05-07  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -587 +587 @@
 {
     WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(gobject);
+    g_clear_pointer(&webView->priv->dialog, gtk_widget_destroy);
     webkitWebViewBaseSetToplevelOnScreenWindow(webView, nullptr);
     if (webView->priv->accessible)
@@ -1662 +1663 @@
 }
 
-static void webkitWebViewBaseDestroy(GtkWidget* widget)
-{
-    WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
-    if (priv->dialog)
-        gtk_widget_destroy(priv->dialog);
-
-    GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->destroy(widget);
-}
-
 static void webkitWebViewBaseConstructed(GObject* object)
 {
@@ -1771 +1763 @@
     widgetClass->hierarchy_changed = webkitWebViewBaseHierarchyChanged;
 #endif
-    widgetClass->destroy = webkitWebViewBaseDestroy;
 
     GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);