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

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8819d5661b6f36a00715dbc03f03ac8ec115e563
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 21:30:40 2009 +0000

    Unreviewed buildbot fix.
    
    Revert part of earlier patch and add comment, as it
    was causing timeouts on the buildbot.
    
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::notifyDone):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ca9d5b3..b071869 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -13,6 +13,16 @@
 
 2009-11-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Unreviewed buildbot fix.
+
+        Revert part of earlier patch and add comment, as it
+        was causing timeouts on the buildbot.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::notifyDone):
+
+2009-11-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Reviewed by Oliver Hunt.
 
         Make the timeout 15 sec as for the other DRT's and make
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 1303840..96b521d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -126,14 +126,16 @@ void LayoutTestController::notifyDone()
 {
     qDebug() << ">>>>notifyDone";
 
-    m_isLoading = false;
-    m_waitForDone = false;
-    m_waitForPolicy = false;
-
     if (!m_timeoutTimer.isActive())
         return;
+
     m_timeoutTimer.stop();
     emit done();
+
+    // FIXME: investigate why always resetting these result in timeouts
+    m_isLoading = false;
+    m_waitForDone = false;
+    m_waitForPolicy = false;
 }
 
 int LayoutTestController::windowCount()

-- 
WebKit Debian packaging