Skip to content
Permalink
Browse files
2009-10-29 Xan Lopez <xlopez@igalia.com>
        Reviewed by Gustavo Noronha.

        Use the GTK+ main loop instead of rolling our own mini-version of
        it.

        * DumpRenderTree/gtk/DumpRenderTree.cpp:
        (dump):
        (runTest):
        (webViewLoadFinished):

Canonical link: https://commits.webkit.org/41740@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@50298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Xan Lopez committed Oct 29, 2009
1 parent cbb1786 commit 275efccc1a733455ee75498379d7300e6aec6d4f
Showing with 15 additions and 4 deletions.
  1. +12 −0 WebKitTools/ChangeLog
  2. +3 −4 WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -1,3 +1,15 @@
2009-10-29 Xan Lopez <xlopez@igalia.com>

Reviewed by Gustavo Noronha.

Use the GTK+ main loop instead of rolling our own mini-version of
it.

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(dump):
(runTest):
(webViewLoadFinished):

2009-10-29 Kenneth Rohde Christiansen <kenneth@webkit.org>

Reviewed by Adam Roben.
@@ -406,6 +406,7 @@ void dump()
fflush(stderr);

done = true;
gtk_main_quit();
}

static void setDefaultsToConsistentStateValuesForTesting()
@@ -484,9 +485,7 @@ static void runTest(const string& testPathOrURL)
g_free(url);
url = NULL;

while (!done)
g_main_context_iteration(NULL, TRUE);

gtk_main();

// Also check if we still have opened webViews and free them.
if (gLayoutTestController->closeRemainingWindowsWhenComplete() || webViewList) {
@@ -565,7 +564,7 @@ static void webViewLoadFinished(WebKitWebView* view, WebKitWebFrame* frame, void

if (WorkQueue::shared()->count())
g_timeout_add(0, processWork, 0);
else
else
dump();
}

0 comments on commit 275efcc

Please sign in to comment.