[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
kov at webkit.org
kov at webkit.org
Thu Oct 29 20:33:34 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 486b014aca0bc0fc47e451d87e033e29b28c7c44
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 24 14:15:32 2009 +0000
2009-09-24 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Jan Alonzo.
[GTK] DRT must display window instead of just realizing, to enable synthesizing events correctly
https://bugs.webkit.org/show_bug.cgi?id=29693
Show the window, to be able to synthesize events correctly.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(runTest):
(main):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9efd035..6aff252 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-24 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Jan Alonzo.
+
+ [GTK] DRT must display window instead of just realizing, to enable synthesizing events correctly
+ https://bugs.webkit.org/show_bug.cgi?id=29693
+
+ Show the window, to be able to synthesize events correctly.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (runTest):
+ (main):
+
2009-09-24 Oliver Hunt <oliver at apple.com>
Reviewed by NOBODY(rollout)
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index f81c96c..5339ccf 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -76,6 +76,7 @@ AccessibilityController* axController = 0;
LayoutTestController* gLayoutTestController = 0;
static GCController* gcController = 0;
static WebKitWebView* webView;
+static GtkWidget* window;
static GtkWidget* container;
WebKitWebFrame* mainFrame = 0;
WebKitWebFrame* topLoadingFrame = 0;
@@ -419,6 +420,7 @@ static void runTest(const string& testPathOrURL)
size.x = size.y = 0;
size.width = isSVGW3CTest ? 480 : maxViewWidth;
size.height = isSVGW3CTest ? 360 : maxViewHeight;
+ gtk_window_resize(GTK_WINDOW(window), size.width, size.height);
gtk_widget_size_allocate(container, &size);
if (prevTestBFItem)
@@ -721,11 +723,11 @@ int main(int argc, char* argv[])
break;
}
- GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
+ window = gtk_window_new(GTK_WINDOW_POPUP);
container = GTK_WIDGET(gtk_scrolled_window_new(NULL, NULL));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(window), container);
- gtk_widget_realize(window);
+ gtk_widget_show_all(window);
webView = createWebView();
gtk_container_add(GTK_CONTAINER(container), GTK_WIDGET(webView));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list