[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
ojan at chromium.org
ojan at chromium.org
Wed Jan 20 22:17:47 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit ecd30fb2ac98239f1cb58a6f64b903ad533dff6a
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 8 21:49:23 2010 +0000
2010-01-08 Ojan Vafai <ojan at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53006 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a7bb88e..cf2dbce 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-08 Ojan Vafai <ojan at 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 at google.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/transitions/cancel-transition.html b/LayoutTests/transitions/cancel-transition.html
index 91876d6..a938076 100644
--- a/LayoutTests/transitions/cancel-transition.html
+++ b/LayoutTests/transitions/cancel-transition.html
@@ -85,6 +85,10 @@
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()
@@ -92,13 +96,6 @@
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()">
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list