Changeset 70677 in webkit

Timestamp:

Oct 27, 2010 11:36:22 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-27 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] r69296 includes a cast from GdkWindow* to GtkWindow*
​https://bugs.webkit.org/show_bug.cgi?id=48445

Pass the pageClient GtkWidget* to gtk_xtbin_new instead of the
GdkWindow*. The pageClient is used to get the proper visual for the
plugin container widget.

No new tests. This patch should prevent plugins/null-npp-getvalue-pointer.html
from crashing.

• plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::platformStart): Pass the widget instead of the window.
• plugins/gtk/gtk2xtbin.c: Accept the widget instead of the window. (gtk_xtbin_new):
• plugins/gtk/gtk2xtbin.h: Update the declaration.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/gtk/PluginViewGtk.cpp (modified) (1 diff)
• plugins/gtk/gtk2xtbin.c (modified) (3 diffs)
• plugins/gtk/gtk2xtbin.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-27  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] r69296 includes a cast from GdkWindow* to GtkWindow*
+        https://bugs.webkit.org/show_bug.cgi?id=48445
+
+        Pass the pageClient GtkWidget* to gtk_xtbin_new instead of the
+        GdkWindow*. The pageClient is used to get the proper visual for the
+        plugin container widget.
+
+        No new tests. This patch should prevent plugins/null-npp-getvalue-pointer.html
+        from crashing.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::platformStart): Pass the widget instead of the window.
+        * plugins/gtk/gtk2xtbin.c: Accept the widget instead of the window.
+        (gtk_xtbin_new):
+        * plugins/gtk/gtk2xtbin.h: Update the declaration.
+
 2010-10-27  Kwang Yul Seo  <skyul@company100.net>
 

trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -791 +791 @@
             g_signal_connect(platformPluginWidget(), "plug-removed", G_CALLBACK(plugRemovedCallback), NULL);
         } else
-            setPlatformWidget(gtk_xtbin_new(gtk_widget_get_window(pageClient), 0));
+            setPlatformWidget(gtk_xtbin_new(pageClient, 0));
 #else
         setPlatformWidget(gtk_socket_new());

trunk/WebCore/plugins/gtk/gtk2xtbin.c

@@ -323 +323 @@
 
 GtkWidget*
-gtk_xtbin_new (GdkWindow *parent_window, String * f)
+gtk_xtbin_new (GtkWidget *parent_widget, String *f)
 {
   GtkXtBin *xtbin;
@@ -330 +330 @@
   GdkVisual* visual;
   Colormap colormap;
+  GdkWindow* parent_window = gtk_widget_get_window(parent_widget);
 
   assert(parent_window != NULL);
@@ -343 +344 @@
   xtbin->parent_window = parent_window;
 
-  screen = gtk_widget_get_screen(GTK_WIDGET(parent_window));
+  screen = gtk_widget_get_screen(parent_widget);
   visual = gdk_screen_get_system_visual(screen);
   colormap = XCreateColormap(GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen)),

trunk/WebCore/plugins/gtk/gtk2xtbin.h

@@ -102 +102 @@
 
 GTKXTBIN_API(GType)       gtk_xtbin_get_type (void);
-GTKXTBIN_API(GtkWidget *) gtk_xtbin_new (GdkWindow *parent_window, String *f);
+GTKXTBIN_API(GtkWidget *) gtk_xtbin_new (GtkWidget *parent_widget, String *f);
 GTKXTBIN_API(void)        gtk_xtbin_set_position (GtkXtBin *xtbin,
                                                   gint       x,