[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6b33783097e2a41fedaa48b895d3d73c030e46c7
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 21:10:58 2009 +0000

    Create, and display a window for the inspector, for inspector tests.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ec1e2eb..bea2831 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-11  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Jan Alonzo.
+
+        Create, and display a window for the inspector, for inspector
+        tests.
+
+        Need to also show/hide the inspector window to avoid having
+        problems with code assuming it is realized
+        https://bugs.webkit.org/show_bug.cgi?id=31347
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (webInspectorShowWindow):
+        (webInspectorCloseWindow):
+        (webInspectorInspectWebView):
+        (createWebView):
+
 2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Unreviewed Qt buildbot fix.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 960e9d0..5408ba1 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -82,6 +82,7 @@ static GCController* gcController = 0;
 static WebKitWebView* webView;
 static GtkWidget* window;
 static GtkWidget* container;
+static GtkWidget* webInspectorWindow;
 WebKitWebFrame* mainFrame = 0;
 WebKitWebFrame* topLoadingFrame = 0;
 guint waitToDumpWatchdog = 0;
@@ -706,9 +707,29 @@ static void databaseQuotaExceeded(WebKitWebView* view, WebKitWebFrame* frame, We
 
 static WebKitWebView* webViewCreate(WebKitWebView*, WebKitWebFrame*);
 
+static gboolean webInspectorShowWindow(WebKitWebInspector*, gpointer data)
+{
+    gtk_window_set_default_size(GTK_WINDOW(webInspectorWindow), 800, 600);
+    gtk_widget_show_all(webInspectorWindow);
+    return TRUE;
+}
+
+static gboolean webInspectorCloseWindow(WebKitWebInspector*, gpointer data)
+{
+    gtk_widget_destroy(webInspectorWindow);
+    webInspectorWindow = 0;
+    return TRUE;
+}
+
 static WebKitWebView* webInspectorInspectWebView(WebKitWebInspector*, gpointer data)
 {
-    return WEBKIT_WEB_VIEW(webkit_web_view_new());
+    webInspectorWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+    GtkWidget* webView = webkit_web_view_new();
+    gtk_container_add(GTK_CONTAINER(webInspectorWindow),
+                      webView);
+
+    return WEBKIT_WEB_VIEW(webView);
 }
 
 static WebKitWebView* createWebView()
@@ -736,7 +757,11 @@ static WebKitWebView* createWebView()
                      NULL);
 
     WebKitWebInspector* inspector = webkit_web_view_get_inspector(view);
-    g_signal_connect(inspector, "inspect-web-view", G_CALLBACK(webInspectorInspectWebView), 0);
+    g_object_connect(G_OBJECT(inspector),
+                     "signal::inspect-web-view", webInspectorInspectWebView, 0,
+                     "signal::show-window", webInspectorShowWindow, 0,
+                     "signal::close-window", webInspectorCloseWindow, 0,
+                     NULL);
 
     return view;
 }

-- 
WebKit Debian packaging