2010-01-08 Ojan Vafai <ojan@chromium.org>
authorojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jan 2010 21:49:23 +0000 (21:49 +0000)
committerojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jan 2010 21:49:23 +0000 (21:49 +0000)
        Reviewed by Darin Adler.

        transitions/cancel-transition.html is flaky
        https://bugs.webkit.org/show_bug.cgi?id=33398

        There's a race between the check() call and the final
        setTimeout. Just remove the final setTimeout and put
        its contents in the check call itself.

        * transitions/cancel-transition.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@53006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/transitions/cancel-transition.html

index a7bb88e..cf2dbce 100644 (file)
@@ -1,3 +1,16 @@
+2010-01-08  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        transitions/cancel-transition.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33398
+
+        There's a race between the check() call and the final
+        setTimeout. Just remove the final setTimeout and put
+        its contents in the check call itself.
+
+        * transitions/cancel-transition.html:
+
 2010-01-08  Yuzo Fujishima  <yuzo@google.com>
 
         Reviewed by Darin Adler.
index 91876d6..a938076 100644 (file)
                 result += "<span style='color:red'>FAIL(was:" + transform[4] + ", s/b:50)</span>";
             else
                 result += "<span style='color:green'>PASS</span>";
+            
+            document.getElementById('result').innerHTML = result;
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
         }
 
         function start()
             document.getElementById("container").className = "run";
             setTimeout("cancelTransition()", 100);
             setTimeout("restartTransition()", 200);
-
-            window.setTimeout(function() {
-                document.getElementById('result').innerHTML = result;
-                if (window.layoutTestController)
-                layoutTestController.notifyDone();
-            },
-            500);
         }
     </script>
 <body onload="start()">