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

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 934a8383c8db7f6669316a8541f64a0a15bc45d0
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 22 23:14:58 2009 +0000

    [Qt] fast/history/back-forward-reset-after-error-handling.html failing due to WorkQueue not being un-frozen
    https://bugs.webkit.org/show_bug.cgi?id=31638
    
    Reviewed by Kenneth Christiansen.
    
    Unfreeze WorkQueue after each test execution.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51299 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6bd8919..cea4188 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-22  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] fast/history/back-forward-reset-after-error-handling.html failing due to WorkQueue not being un-frozen
+        https://bugs.webkit.org/show_bug.cgi?id=31638
+
+        Unfreeze WorkQueue after each test execution.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
 2009-11-22  Jakub Wieczorek  <faw217 at gmail.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index a4ef6bd..8655931 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -371,9 +371,7 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
     qt_drt_clearFrameName(m_page->mainFrame());
 
     WorkQueue::shared()->clear();
-    // The below line is used in other ports, but for us it results in
-    // a timeout for fast/frames/frame-navigation.html
-    //WorkQueue::shared()->setFrozen(false);
+    WorkQueue::shared()->setFrozen(false);
 
     qt_drt_resetOriginAccessWhiteLists();
 

-- 
WebKit Debian packaging