Title: [261276] trunk/Source/WebKit
- Revision
- 261276
- Author
- [email protected]
- Date
- 2020-05-07 02:05:36 -0700 (Thu, 07 May 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (261275 => 261276)
--- trunk/Source/WebKit/ChangeLog 2020-05-07 08:40:00 UTC (rev 261275)
+++ trunk/Source/WebKit/ChangeLog 2020-05-07 09:05:36 UTC (rev 261276)
@@ -1,3 +1,18 @@
+2020-05-07 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
[WPE][Qt] Enable by default
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (261275 => 261276)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-05-07 08:40:00 UTC (rev 261275)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-05-07 09:05:36 UTC (rev 261276)
@@ -586,6 +586,7 @@
static void webkitWebViewBaseDispose(GObject* gobject)
{
WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(gobject);
+ g_clear_pointer(&webView->priv->dialog, gtk_widget_destroy);
webkitWebViewBaseSetToplevelOnScreenWindow(webView, nullptr);
if (webView->priv->accessible)
webkitWebViewAccessibleSetWebView(WEBKIT_WEB_VIEW_ACCESSIBLE(webView->priv->accessible.get()), nullptr);
@@ -1661,15 +1662,6 @@
return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->focus(widget, direction);
}
-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)
{
G_OBJECT_CLASS(webkit_web_view_base_parent_class)->constructed(object);
@@ -1770,7 +1762,6 @@
#if !USE(GTK4)
widgetClass->hierarchy_changed = webkitWebViewBaseHierarchyChanged;
#endif
- widgetClass->destroy = webkitWebViewBaseDestroy;
GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
gobjectClass->constructed = webkitWebViewBaseConstructed;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
