[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5296ed171acb6c6898a889db88012247ab6504c0
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 13:56:17 2010 +0000

    2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            WTR: Prevent sending the Done message twice on test timeout.
            https://bugs.webkit.org/show_bug.cgi?id=47410
    
            When InjectedBundle::done() calls stopLoading, this may trigger
            InjectedBundlePage::didFailLoadWithErrorForFrame which calls
            InjectedBundle::done() itself later in the stack.
            This would output the timeout failure message twice and confuse
            the run-webkit-tests script.
    
            This patch adds a third state, Stopping, which prevents WebCore
            errors to trigger done() when testing is over.
    
            * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
            (WTR::InjectedBundle::done):
            * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 52c6166..116ffc3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WTR: Prevent sending the Done message twice on test timeout.
+        https://bugs.webkit.org/show_bug.cgi?id=47410
+
+        When InjectedBundle::done() calls stopLoading, this may trigger
+        InjectedBundlePage::didFailLoadWithErrorForFrame which calls
+        InjectedBundle::done() itself later in the stack.
+        This would output the timeout failure message twice and confuse
+        the run-webkit-tests script.
+
+        This patch adds a third state, Stopping, which prevents WebCore
+        errors to trigger done() when testing is over.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::done):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+
 2010-10-08  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index 6304549..af8bb69 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -139,6 +139,8 @@ void InjectedBundle::beginTesting()
 
 void InjectedBundle::done()
 {
+    m_state = Stopping;
+
     m_mainPage->stopLoading();
 
     WKRetainPtr<WKStringRef> doneMessageName(AdoptWK, WKStringCreateWithUTF8CString("Done"));
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
index 520ea1f..6c5c69e 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
@@ -88,7 +88,8 @@ private:
     
     enum State {
         Idle,
-        Testing
+        Testing,
+        Stopping
     };
     State m_state;
 };

-- 
WebKit Debian packaging