[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
ojan at chromium.org
ojan at chromium.org
Thu Apr 8 01:15:13 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 29f99dcf05465e2e8b1e3f32d12b44679850fc02
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 19 22:14:03 2010 +0000
2010-01-15 Ojan Vafai <ojan at chromium.org>
Reviewed by Adam Barth.
LayoutTests/animations/play-state.html and LayoutTests/transitions/cancel-transition.html are still flaky
https://bugs.webkit.org/show_bug.cgi?id=33748
* animations/play-state-expected.txt:
* animations/play-state.html:
Undo my previous change of decreasing the length of the test. I think that made it more flaky.
Also increase the tolerance.
* transitions/cancel-transition.html:
Undo my previous change of moving the setTimeout. It was correct where it was.
Added a comment to make it more clear. The tolerances were increased since then though,
so this test should no longer be flaky after this.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9aee240..616f3e9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-15 Ojan Vafai <ojan at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ LayoutTests/animations/play-state.html and LayoutTests/transitions/cancel-transition.html are still flaky
+ https://bugs.webkit.org/show_bug.cgi?id=33748
+
+ * animations/play-state-expected.txt:
+ * animations/play-state.html:
+ Undo my previous change of decreasing the length of the test. I think that made it more flaky.
+ Also increase the tolerance.
+
+ * transitions/cancel-transition.html:
+ Undo my previous change of moving the setTimeout. It was correct where it was.
+ Added a comment to make it more clear. The tolerances were increased since then though,
+ so this test should no longer be flaky after this.
+
2010-01-19 Jaime Yap <jaimeyap at google.com>
Reviewed by Pavel Feldman.
diff --git a/LayoutTests/animations/play-state-expected.txt b/LayoutTests/animations/play-state-expected.txt
index cb60227..82ec77b 100644
--- a/LayoutTests/animations/play-state-expected.txt
+++ b/LayoutTests/animations/play-state-expected.txt
@@ -1,9 +1,9 @@
-This tests the operation of -webkit-animation-play-state. After half a second the box should stop and after one more half-second it should start again. We test it both while in motion and when stopped.
+This tests the operation of -webkit-animation-play-state. After 2 second the box should stop and after one more second it should start again. We test it both while in motion and when stopped.
-PASS - "webkitTransform" property for "box1" element at 0.25s saw something close to: 1,0,0,1,25,0
-PASS - "left" property for "box2" element at 0.25s saw something close to: 25
-PASS - "webkitTransform" property for "box1" element at 0.75s saw something close to: 1,0,0,1,50,0
-PASS - "left" property for "box2" element at 0.75s saw something close to: 50
-PASS - "webkitTransform" property for "box1" element at 1.25s saw something close to: 1,0,0,1,75,0
-PASS - "left" property for "box2" element at 1.25s saw something close to: 75
+PASS - "webkitTransform" property for "box1" element at 0.5s saw something close to: 1,0,0,1,25,0
+PASS - "left" property for "box2" element at 0.5s saw something close to: 25
+PASS - "webkitTransform" property for "box1" element at 1.5s saw something close to: 1,0,0,1,50,0
+PASS - "left" property for "box2" element at 1.5s saw something close to: 50
+PASS - "webkitTransform" property for "box1" element at 2.5s saw something close to: 1,0,0,1,75,0
+PASS - "left" property for "box2" element at 2.5s saw something close to: 75
diff --git a/LayoutTests/animations/play-state.html b/LayoutTests/animations/play-state.html
index 48245be..b9b84ca 100644
--- a/LayoutTests/animations/play-state.html
+++ b/LayoutTests/animations/play-state.html
@@ -9,7 +9,7 @@
width: 100px;
background-color: blue;
margin: 0;
- -webkit-animation-duration: 1s;
+ -webkit-animation-duration: 2s;
-webkit-animation-timing-function: linear;
-webkit-animation-name: "move1";
-webkit-animation-play-state: running;
@@ -24,7 +24,7 @@
height: 100px;
width: 100px;
background-color: red;
- -webkit-animation-duration: 1s;
+ -webkit-animation-duration: 2s;
-webkit-animation-timing-function: linear;
-webkit-animation-name: "move2";
}
@@ -38,12 +38,12 @@
const expectedValues = [
// [animation-name, time, element-id, property, expected-value, tolerance]
- ["move1", 0.25, "box1", "webkitTransform", [1,0,0,1,25,0], 10],
- ["move1", 0.75, "box1", "webkitTransform", [1,0,0,1,50,0], 10],
- ["move1", 1.25, "box1", "webkitTransform", [1,0,0,1,75,0], 10],
- ["move2", 0.25, "box2", "left", 25, 10],
- ["move3", 0.75, "box2", "left", 50, 10],
- ["move4", 1.25, "box2", "left", 75, 10],
+ ["move1", 0.5, "box1", "webkitTransform", [1,0,0,1,25,0], 15],
+ ["move1", 1.5, "box1", "webkitTransform", [1,0,0,1,50,0], 15],
+ ["move1", 2.5, "box1", "webkitTransform", [1,0,0,1,75,0], 15],
+ ["move2", 0.5, "box2", "left", 25, 15],
+ ["move3", 1.5, "box2", "left", 50, 15],
+ ["move4", 2.5, "box2", "left", 75, 15],
];
function stop()
@@ -60,8 +60,8 @@
function setTimers()
{
- setTimeout(stop, 500);
- setTimeout(start, 1000);
+ setTimeout(stop, 1000);
+ setTimeout(start, 2000);
}
runAnimationTest(expectedValues, setTimers, null, true);
@@ -70,8 +70,8 @@
</head>
<body>
<p>
-This tests the operation of -webkit-animation-play-state. After half a second the box should stop and after one
-more half-second it should start again. We test it both while in motion and when stopped.
+This tests the operation of -webkit-animation-play-state. After 2 second the box should stop and after one
+more second it should start again. We test it both while in motion and when stopped.
<div id="box1">
</div>
<div id="box2">
diff --git a/LayoutTests/transitions/cancel-transition.html b/LayoutTests/transitions/cancel-transition.html
index 93de57f..eaebf1c 100644
--- a/LayoutTests/transitions/cancel-transition.html
+++ b/LayoutTests/transitions/cancel-transition.html
@@ -62,6 +62,8 @@
function restartTransition()
{
document.getElementById("container").className = "run";
+ // The transition should restart at the beginning here. After 250 it should be halfway done.
+ setTimeout("check()", 250);
}
function check()
@@ -93,7 +95,6 @@
document.getElementById("container").className = "run";
setTimeout("cancelTransition()", 100);
setTimeout("restartTransition()", 200);
- setTimeout("check()", 500);
}
</script>
<body onload="start()">
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list