[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e99dfc8b9893aae349a210ba8a2c8ce3192493b8
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 15:18:56 2009 +0000

    2009-09-29  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Do not set a non-default parent window for child widgets. We are
            just doing the same than the default path does, and on top of that
            if the widget's window changes (for example, during DnD widgets
            are usually unrealized/realized) the child widget will we left
            pointing to a dead window.
    
            For examples of crashers caused by this see
            https://bugzilla.gnome.org/show_bug.cgi?id=596397 and
            https://bugzilla.gnome.org/show_bug.cgi?id=596398
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_container_add):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48877 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index bf79e70..4265988 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,22 @@
 2009-09-29  Xan Lopez  <xlopez at igalia.com>
 
+        Reviewed by Gustavo Noronha.
+
+        Do not set a non-default parent window for child widgets. We are
+        just doing the same than the default path does, and on top of that
+        if the widget's window changes (for example, during DnD widgets
+        are usually unrealized/realized) the child widget will we left
+        pointing to a dead window.
+
+        For examples of crashers caused by this see
+        https://bugzilla.gnome.org/show_bug.cgi?id=596397 and
+        https://bugzilla.gnome.org/show_bug.cgi?id=596398
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_container_add):
+
+2009-09-29  Xan Lopez  <xlopez at igalia.com>
+
         Rubber-stamped by Eric Seidel.
 
         [Gtk] Crash when saving a password
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 777000b..382625a 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -713,8 +713,6 @@ static void webkit_web_view_container_add(GtkContainer* container, GtkWidget* wi
     WebKitWebViewPrivate* priv = webView->priv;
 
     priv->children.add(widget);
-    if (GTK_WIDGET_REALIZED(container))
-        gtk_widget_set_parent_window(widget, GTK_WIDGET(webView)->window);
     gtk_widget_set_parent(widget, GTK_WIDGET(container));
 }
 

-- 
WebKit Debian packaging