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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 06cd711f3f1c3e0314529449eef739b501f78992
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 18:01:24 2009 +0000

    Re-enable DRT's watchdog timer on Windows
    
    It was accidentally disabled in r50907.
    
    * DumpRenderTree/win/LayoutTestControllerWin.cpp:
    (LayoutTestController::setWaitToDump): Remove a "false &&" that snuck
    into an if condition.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aeb223a..4996fd5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-01  Adam Roben  <aroben at apple.com>
+
+        Re-enable DRT's watchdog timer on Windows
+
+        It was accidentally disabled in r50907.
+
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::setWaitToDump): Remove a "false &&" that snuck
+        into an if condition.
+
 2009-12-01  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index 0b77be6..362729e 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -693,7 +693,7 @@ static void CALLBACK waitUntilDoneWatchdogFired(HWND, UINT, UINT_PTR, DWORD)
 void LayoutTestController::setWaitToDump(bool waitUntilDone)
 {
     m_waitToDump = waitUntilDone;
-    if (false && m_waitToDump && !waitToDumpWatchdog)
+    if (m_waitToDump && !waitToDumpWatchdog)
         waitToDumpWatchdog = SetTimer(0, 0, waitToDumpWatchdogInterval * 1000, waitUntilDoneWatchdogFired);
 }
 

-- 
WebKit Debian packaging