Merge r156287 - [GTK][WK2] A plugin dirtyRect within iframe remains a…

…fter moving to a different page. https://bugs.webkit.org/show_bug.cgi?id=121600 Reviewed by Gustavo Noronha Silva. Nowhere to destroy NetscapePlugin::m_platformPluginWidget even after destroying an instance of NetscapePlugin. So the created GtkWidget remains visible. * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: (WebKit::NetscapePlugin::platformDestroy):
WebKit · Oct 7, 2013 · ab1a06b · ab1a06b
1 parent 0dff2a8
commit ab1a06b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-23  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][WK2] A plugin dirtyRect within iframe remains after moving to a different page.
+        https://bugs.webkit.org/show_bug.cgi?id=121600
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Nowhere to destroy NetscapePlugin::m_platformPluginWidget even after destroying
+        an instance of NetscapePlugin. So the created GtkWidget remains visible.
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::NetscapePlugin::platformDestroy):
+
 2013-08-28  Chris Curtis  <chris_curtis@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=119548

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
@@ -297,6 +297,13 @@ void NetscapePlugin::platformDestroy()
         XFreePixmap(hostDisplay, m_drawable);
         m_drawable = 0;
     }
+
+#if PLATFORM(GTK)
+    if (m_platformPluginWidget) {
+        gtk_widget_destroy(m_platformPluginWidget);
+        m_platformPluginWidget = 0;
+    }
+#endif
 }
 
 bool NetscapePlugin::platformInvalidate(const IntRect&)