Attachment 398711 Details for Bug 211553 – Patch

[patch] Patch

bug-211553-20200507111222.patch (text/plain), 2.76 KB, created by Adrian Perez on 2020-05-07 01:12:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2020-05-07 01:12:23 PDT

Size: 2.76 KB

patch

obsolete

>Subversion Revision: 261259
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 65e5755748bae401419b80f1e04aeaa0fceb3869..28ba3be672195a6fc4b7f232a0c11c58a0785d04 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        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-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Use CocoaColor in more places instead of platform defines
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>index 6288657f404b1c7b3c678af7494f77e0ba3926e4..4aa69fbc9f264ef5b028a1a9c3801c2fe73411bb 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>@@ -586,6 +586,7 @@ static void webkitWebViewBaseCompleteEmojiChooserRequest(WebKitWebViewBase* webV
> 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 @@ static gboolean webkitWebViewBaseFocus(GtkWidget* widget, GtkDirectionType direc
>     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 @@ static void webkit_web_view_base_class_init(WebKitWebViewBaseClass* webkitWebVie
> #if !USE(GTK4)
>     widgetClass->hierarchy_changed = webkitWebViewBaseHierarchyChanged;
> #endif
>-    widgetClass->destroy = webkitWebViewBaseDestroy;
> 
>     GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
>     gobjectClass->constructed = webkitWebViewBaseConstructed;

Actions: View | Formatted Diff | Diff

Attachments on bug 211553: 398711