[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e8f4bd6c2e93f27e89c06b35b7c71b529586ea32
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 18:36:22 2010 +0000

    2010-10-27  Martin Robinson  <mrobinson at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 443707b..a01bcf9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-27  Martin Robinson  <mrobinson at 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 at company100.net>
 
         Reviewed by James Robinson.
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 6954af3..80641a1 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -790,7 +790,7 @@ bool PluginView::platformStart()
             g_signal_connect(platformPluginWidget(), "plug-added", G_CALLBACK(plugAddedCallback), this);
             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());
         gtk_container_add(GTK_CONTAINER(pageClient), platformPluginWidget());
diff --git a/WebCore/plugins/gtk/gtk2xtbin.c b/WebCore/plugins/gtk/gtk2xtbin.c
index 31c564f..f668bff 100644
--- a/WebCore/plugins/gtk/gtk2xtbin.c
+++ b/WebCore/plugins/gtk/gtk2xtbin.c
@@ -322,13 +322,14 @@ gtk_xtbin_realize (GtkWidget *widget)
 
 
 GtkWidget*
-gtk_xtbin_new (GdkWindow *parent_window, String * f)
+gtk_xtbin_new (GtkWidget *parent_widget, String *f)
 {
   GtkXtBin *xtbin;
   gpointer user_data;
   GdkScreen *screen;
   GdkVisual* visual;
   Colormap colormap;
+  GdkWindow* parent_window = gtk_widget_get_window(parent_widget);
 
   assert(parent_window != NULL);
   xtbin = g_object_new (GTK_TYPE_XTBIN, NULL);
@@ -342,7 +343,7 @@ gtk_xtbin_new (GdkWindow *parent_window, String * f)
   /* Initialize the Xt toolkit */
   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)),
                              GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(screen)),
diff --git a/WebCore/plugins/gtk/gtk2xtbin.h b/WebCore/plugins/gtk/gtk2xtbin.h
index 7bcfab6..11f6e06 100644
--- a/WebCore/plugins/gtk/gtk2xtbin.h
+++ b/WebCore/plugins/gtk/gtk2xtbin.h
@@ -101,7 +101,7 @@ struct _GtkXtBinClass
 };
 
 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,
                                                   gint       y);

-- 
WebKit Debian packaging