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

tonikitoo at webkit.org tonikitoo at webkit.org
Wed Apr 7 23:25:39 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 72c37fd5e79c752ee7b7aa8e1b5df8573c447f38
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 8 17:26:01 2009 +0000

    [Qt] [DRT] Fix wrong logic in LayoutTestController processWork
    https://bugs.webkit.org/show_bug.cgi?id=31164
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-11-05
    Reviewed by Holger Freyther.
    
    Fixed wrong logic to assume WorkQueue is done in QT's DRT.
    
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::processWork):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 800dbaa..edca0f2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Holger Freyther.
 
+        [Qt] [DRT] Fix wrong logic in LayoutTestController processWork
+        https://bugs.webkit.org/show_bug.cgi?id=31164
+
+        Fixed wrong logic to assume WorkQueue is done in QT's DRT.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::processWork):
+
+2009-11-05  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Holger Freyther.
+
         [Qt][DRT] Replace queueScript by queueNonLoadingScript and queueLoadingScript method
         https://bugs.webkit.org/show_bug.cgi?id=31158
 
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 00a6081..8311d91 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -73,7 +73,7 @@ void LayoutTestController::processWork()
     // qDebug() << ">>>processWork";
 
     // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
-    if (!WorkQueue::shared()->processWork() && !shouldWaitUntilDone()) {
+    if (WorkQueue::shared()->processWork() && !shouldWaitUntilDone()) {
         emit done();
         m_isLoading = false;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list