Changeset 192311 in webkit

Timestamp:

Nov 11, 2015 8:36:29 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Runtime critical warnings when closing a page containing windowed plugins
​https://bugs.webkit.org/show_bug.cgi?id=151132

Reviewed by Martin Robinson.

This is because our plugin widget, that is a GtkPlug (derived from
GtkWindow), can receive the delete-event signal before
NetscapePlugin::platformDestroy is called. The delete-event
signal, by default, destroys the window when the signal is not
handled. So, after the delete-event the GtkPlug is destroyed, but
our pointer hasn't been reset. We can handle the delete-event
using gtk_widget_hide_on_delete as callback, so that the plugin
widget is hidden instead of destroyed.

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:

(WebKit::NetscapePlugin::platformPostInitializeWindowed):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Runtime critical warnings when closing a page containing windowed plugins
+        https://bugs.webkit.org/show_bug.cgi?id=151132
+
+        Reviewed by Martin Robinson.
+
+        This is because our plugin widget, that is a GtkPlug (derived from
+        GtkWindow), can receive the delete-event signal before
+        NetscapePlugin::platformDestroy is called. The delete-event
+        signal, by default, destroys the window when the signal is not
+        handled. So, after the delete-event the GtkPlug is destroyed, but
+        our pointer hasn't been reset. We can handle the delete-event
+        using gtk_widget_hide_on_delete as callback, so that the plugin
+        widget is hidden instead of destroyed.
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::NetscapePlugin::platformPostInitializeWindowed):
+
 2015-11-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -135 +135 @@
     // containing a plug with the UI process socket embedded.
     m_platformPluginWidget = gtk_plug_new(static_cast<Window>(windowID));
+
+    // Hide the GtkPlug on delete-event since we assume the widget is valid while the plugin is active.
+    // platformDestroy() will be called anyway right after the delete-event.
+    g_signal_connect(m_platformPluginWidget, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), nullptr);
+
     GtkWidget* socket = gtk_socket_new();
     // Do not show the plug widget until the socket is connected.