Fix hang in fast/frames/frame-display-none-focus.html during Gtk layout tests.

Reviewed by Alp Toker.

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(processWork): Process pending work.
(webViewLoadFinished): Schedule processing of pending work.
* DumpRenderTree/gtk/WorkQueueItemGtk.cpp: Use webkit_web_frame_reload.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ce2192b5fc9ae9eb7e003715eb1da4ee988e38f8..36a606badd5413edb627bcebc5af8ed2c34f53de 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-05  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alp Toker.
+
+        Fix hang in fast/frames/frame-display-none-focus.html during Gtk layout tests.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (processWork): Process pending work.
+        (webViewLoadFinished): Schedule processing of pending work.
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp: Use webkit_web_frame_reload.
+
 2008-01-05  Darin Adler  <darin@apple.com>
 
         * Scripts/do-webcore-rename: Some more renaming plans.

diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 53d329bf3a425e3de0313476eee18a53fe0262df..73a25f78970d8f75343d61ae8548561c42769d5a 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -39,6 +39,8 @@
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
+#include <wtf/Assertions.h>
+
 #include <cassert>
 #include <getopt.h>
 #include <stdlib.h>
@@ -240,6 +242,23 @@ void webViewLoadStarted(WebKitWebView* view, WebKitWebFrame* frame, void*)
         topLoadingFrame = frame;
 }
 
+static gboolean processWork(void* data)
+{
+    // quit doing work once a load is in progress
+    while (WorkQueue::shared()->count() > 0 && !topLoadingFrame) {
+        WorkQueueItem* item = WorkQueue::shared()->dequeue();
+        ASSERT(item);
+        item->invoke();
+        delete item;
+    }
+
+    // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
+    if (!topLoadingFrame && !layoutTestController->waitToDump())
+        dump();
+
+    return FALSE;
+}
+
 void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
 {
     if (frame != topLoadingFrame)
@@ -251,7 +270,7 @@ void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void*)
         return;
 
     if (WorkQueue::shared()->count())
-        fprintf(stderr, "FIXME: [self performSelector:@selector(processWork:) withObject:nil afterDelay:0];\n");
+        g_timeout_add(0, processWork, 0);
      else
         dump();
 }

diff --git a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
index e81b610fa3fee7b09414dc712304ccbfd7657f2a..f47e021f8918ed6abe3a75c4b4dc94489b2654a0 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
@@ -56,9 +56,7 @@ void LoadItem::invoke() const
 
 void ReloadItem::invoke() const
 {
-    // TODO: Why not just reload the frame?
-    WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
-    webkit_web_view_reload(webView);
+    webkit_web_frame_reload(mainFrame);
 }
 
 void ScriptItem::invoke() const