Changeset 158720 in webkit

Timestamp:

Nov 5, 2013 9:50:35 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Flaky Test: transitions/cancel-transition.html
​https://bugs.webkit.org/show_bug.cgi?id=114193

Reviewed by Simon Fraser.

Merge ​https://chromium.googlesource.com/chromium/blink/+/983dbbff6c46b6365540bf1451f25b31d72ce893

• transitions/cancel-transition.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• transitions/cancel-transition.html (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Flaky Test: transitions/cancel-transition.html
+        https://bugs.webkit.org/show_bug.cgi?id=114193
+
+        Reviewed by Simon Fraser.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/983dbbff6c46b6365540bf1451f25b31d72ce893
+
+        * transitions/cancel-transition.html:
+
 2013-11-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/transitions/cancel-transition.html

@@ -55 +55 @@
         {
             document.getElementById("container").className = "";
+            document.body.offsetHeight;
         }
 
@@ -60 +61 @@
         {
             document.getElementById("container").className = "run";
+            document.body.offsetHeight;
             // The transition should restart at the beginning here. After 250 it should be halfway done.
             setTimeout("check()", 250);
@@ -91 +93 @@
         {
             document.getElementById("container").className = "run";
+            document.body.offsetHeight;
             setTimeout("cancelTransition()", 100);
             setTimeout("restartTransition()", 200);