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

[dimich at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit c24814541a0ec4932d1656a18aeea9a4d3c7f302
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 18:07:03 2009 +0000

    Fix worker-timeout.html layout test that fails in Chromium harness.
    https://bugs.webkit.org/show_bug.cgi?id=31452
    
    Reviewed by Darin Adler.
    
    * fast/workers/worker-timeout.html:
    Stop logging timer messages at the same time as calling NotifyDone() because
    in test harness Chromium uses for workers it does not capture the output immediately.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 049b05a..2da2b0a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-13  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix worker-timeout.html layout test that fails in Chromium harness.
+        https://bugs.webkit.org/show_bug.cgi?id=31452
+
+        * fast/workers/worker-timeout.html:
+        Stop logging timer messages at the same time as calling NotifyDone() because
+        in test harness Chromium uses for workers it does not capture the output immediately.
+
 2009-11-13  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/workers/worker-timeout.html b/LayoutTests/fast/workers/worker-timeout.html
index bca5c0f..1dbea8e 100644
--- a/LayoutTests/fast/workers/worker-timeout.html
+++ b/LayoutTests/fast/workers/worker-timeout.html
@@ -2,9 +2,11 @@
 <p>Test Timeouts (setTimeout, setInterval, clearTimeout, clearInterval).</p>
 <div id=result></div>
 <script>
+var logIsFrozen = false;
 function log(message)
 {
-    document.getElementById("result").innerHTML += message + "<br>";
+    if (!logIsFrozen)
+        document.getElementById("result").innerHTML += message + "<br>";
 }
 
 if (window.layoutTestController) {
@@ -16,8 +18,16 @@ var worker = new Worker('resources/worker-timeout.js');
 
 worker.onmessage = function(evt) {
     log(evt.data);
-    if (evt.data == "DONE" && window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (evt.data == "DONE") {
+        // This flag is needed because in Chromium port, the notifyDone() does not immediately snapshots
+        // the result and the still-firing timer in the worker may cause more messages to be logged before
+        // actual termination of the test. However one objective of the test is to keep active interval
+        // while the worker gets destroyed, so we freeze log rather then stop the interval from firing.
+        // See https://bugs.webkit.org/show_bug.cgi?id=31452 for more info.
+        logIsFrozen = true;
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    } 
 }
 </script>
 </body>

-- 
WebKit Debian packaging