[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:34 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 586e069cba8df75dafaf6d70e6cd0d42ad82e840
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 19 23:49:05 2010 +0000
2010-01-19 Ojan Vafai <ojan at chromium.org>
Reviewed by Eric Seidel.
More flaky animation/transitions tests
https://bugs.webkit.org/show_bug.cgi?id=33872
Undo my previous changes decreasing test times. This ended up
increasing flakiness.
* animations/change-one-anim-expected.txt:
* animations/change-one-anim.html:
* animations/combo-transform-translate+scale.html:
* transitions/shorthand-border-transitions-expected.txt:
* transitions/shorthand-border-transitions.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5a1be47..5774d6d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-19 Ojan Vafai <ojan at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ More flaky animation/transitions tests
+ https://bugs.webkit.org/show_bug.cgi?id=33872
+
+ Undo my previous changes decreasing test times. This ended up
+ increasing flakiness.
+
+ * animations/change-one-anim-expected.txt:
+ * animations/change-one-anim.html:
+ * animations/combo-transform-translate+scale.html:
+ * transitions/shorthand-border-transitions-expected.txt:
+ * transitions/shorthand-border-transitions.html:
+
2010-01-19 Alexey Proskuryakov <ap at apple.com>
Reviewed by Oliver Hunt.
diff --git a/LayoutTests/animations/change-one-anim-expected.txt b/LayoutTests/animations/change-one-anim-expected.txt
index e014d41..1d47d94 100644
--- a/LayoutTests/animations/change-one-anim-expected.txt
+++ b/LayoutTests/animations/change-one-anim-expected.txt
@@ -1,4 +1,4 @@
-This test performs two animations, left and top. It animates over 0.4 second. At 0.2 second it removes the left animation and the top animation should continue from where it left off.
-PASS - "left" property for "box" element at 0.3s saw something close to: 200
-PASS - "top" property for "box" element at 0.3s saw something close to: 300
+This test performs two animations, left and top. It animates over 1 second. At 0.5 second it removes the left animation and the top animation should continue from where it left off.
+PASS - "left" property for "box" element at 0.75s saw something close to: 150
+PASS - "top" property for "box" element at 0.75s saw something close to: 225
diff --git a/LayoutTests/animations/change-one-anim.html b/LayoutTests/animations/change-one-anim.html
index 1b5588d..b58bb17 100644
--- a/LayoutTests/animations/change-one-anim.html
+++ b/LayoutTests/animations/change-one-anim.html
@@ -12,7 +12,7 @@
width: 20px;
background-color: #9bb;
-webkit-animation-name: horiz, vert;
- -webkit-animation-duration: 0.4s;
+ -webkit-animation-duration: 1s;
-webkit-animation-iteration-count: infinite;
-webkit-animation-direction: alternate;
-webkit-animation-timing-function: linear;
@@ -20,11 +20,11 @@
@-webkit-keyframes horiz {
from { left: 0px; }
- to { left: 400px; }
+ to { left:300px; }
}
@-webkit-keyframes vert {
from { top: 0px; }
- to { top: 400px; }
+ to { top: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
@@ -32,8 +32,8 @@
const expectedValues = [
// [animation-name, time, element-id, property, expected-value, tolerance]
- [null, 0.3, "box", "left", 200, 40],
- [null, 0.3, "box", "top", 300, 40],
+ [null, 0.75, "box", "left", 150, 40],
+ [null, 0.75, "box", "top", 225, 40],
];
function removeAnim()
@@ -46,15 +46,15 @@
function setup()
{
- setTimeout("removeAnim()", 200);
+ setTimeout("removeAnim()", 500);
}
runAnimationTest(expectedValues, setup);
</script>
</head>
<body>
-This test performs two animations, left and top. It animates over 0.4 second.
-At 0.2 second it removes the left animation and the top animation should continue
+This test performs two animations, left and top. It animates over 1 second.
+At 0.5 second it removes the left animation and the top animation should continue
from where it left off.
<div id="box">
</div>
diff --git a/LayoutTests/animations/combo-transform-translate+scale.html b/LayoutTests/animations/combo-transform-translate+scale.html
index d330c14..6a78a31 100644
--- a/LayoutTests/animations/combo-transform-translate+scale.html
+++ b/LayoutTests/animations/combo-transform-translate+scale.html
@@ -29,7 +29,7 @@
const expected = [ [ 1.25,0,0,1.75,25,50 ],
[ 1.5,0,0,2.5,50,100 ] ];
- const tolerance = [ 0.2,0.2,0.2,0.3,5,15 ];
+ const tolerance = [ 0.2,0.2,0.2,0.3,8,15 ];
const prop = [ "a", "b", "c", "d", "e", "f" ];
function isEqual(actual, desired, tolerance)
diff --git a/LayoutTests/transitions/shorthand-border-transitions-expected.txt b/LayoutTests/transitions/shorthand-border-transitions-expected.txt
index 7c35d92..58d7062 100644
--- a/LayoutTests/transitions/shorthand-border-transitions-expected.txt
+++ b/LayoutTests/transitions/shorthand-border-transitions-expected.txt
@@ -1,15 +1,15 @@
Tests transitions of the border shorthand properties.
-PASS - "border-top-color" property for "box" element at 0.25s saw something close to: 128,0,128
-PASS - "border-right-color" property for "box" element at 0.25s saw something close to: 128,0,128
-PASS - "border-bottom-color" property for "box" element at 0.25s saw something close to: 128,0,128
-PASS - "border-left-color" property for "box" element at 0.25s saw something close to: 128,0,128
-PASS - "border-top-width" property for "box" element at 0.25s saw something close to: 10
-PASS - "border-right-width" property for "box" element at 0.25s saw something close to: 10
-PASS - "border-bottom-width" property for "box" element at 0.25s saw something close to: 10
-PASS - "border-left-width" property for "box" element at 0.25s saw something close to: 10
-PASS - "border-top-width" property for "box1" element at 0.25s saw something close to: 10
-PASS - "border-top-color" property for "box1" element at 0.25s saw something close to: 255,0,255
-PASS - "border-top-width" property for "box2" element at 0.25s saw something close to: 10
-PASS - "border-bottom-width" property for "box2" element at 0.25s saw something close to: 20
+PASS - "border-top-color" property for "box" element at 0.5s saw something close to: 128,0,128
+PASS - "border-right-color" property for "box" element at 0.5s saw something close to: 128,0,128
+PASS - "border-bottom-color" property for "box" element at 0.5s saw something close to: 128,0,128
+PASS - "border-left-color" property for "box" element at 0.5s saw something close to: 128,0,128
+PASS - "border-top-width" property for "box" element at 0.5s saw something close to: 10
+PASS - "border-right-width" property for "box" element at 0.5s saw something close to: 10
+PASS - "border-bottom-width" property for "box" element at 0.5s saw something close to: 10
+PASS - "border-left-width" property for "box" element at 0.5s saw something close to: 10
+PASS - "border-top-width" property for "box1" element at 0.5s saw something close to: 10
+PASS - "border-top-color" property for "box1" element at 0.5s saw something close to: 255,0,255
+PASS - "border-top-width" property for "box2" element at 0.5s saw something close to: 10
+PASS - "border-bottom-width" property for "box2" element at 0.5s saw something close to: 20
diff --git a/LayoutTests/transitions/shorthand-border-transitions.html b/LayoutTests/transitions/shorthand-border-transitions.html
index fc35871..362eab1 100644
--- a/LayoutTests/transitions/shorthand-border-transitions.html
+++ b/LayoutTests/transitions/shorthand-border-transitions.html
@@ -12,7 +12,7 @@
margin: 10px;
background-color: gray;
border: 0px solid rgb(0, 0, 0);
- -webkit-transition: border 0.5s linear;
+ -webkit-transition: border 1s linear;
}
#box.final {
@@ -25,7 +25,7 @@
margin: 10px;
background-color: gray;
border: 0px solid rgb(0, 0, 0);
- -webkit-transition: border-width 0.5s linear;
+ -webkit-transition: border-width 1s linear;
}
#box1.final {
@@ -38,7 +38,7 @@
margin: 10px;
background-color: gray;
border: 0px solid rgb(0, 0, 0);
- -webkit-transition: border 0.5s linear;
+ -webkit-transition: border 1s linear;
}
#box2.final {
@@ -52,22 +52,22 @@
const expectedValues = [
// [time, element-id, property, expected-value, tolerance]
// color and width of each side should be animating
- [0.25, 'box', 'border-top-color', [128, 0, 128], 30],
- [0.25, 'box', 'border-right-color', [128, 0, 128], 30],
- [0.25, 'box', 'border-bottom-color', [128, 0, 128], 30],
- [0.25, 'box', 'border-left-color', [128, 0, 128], 30],
- [0.25, 'box', 'border-top-width', 10, 2],
- [0.25, 'box', 'border-right-width', 10, 2],
- [0.25, 'box', 'border-bottom-width', 10, 2],
- [0.25, 'box', 'border-left-width', 10, 2],
+ [0.5, 'box', 'border-top-color', [128, 0, 128], 30],
+ [0.5, 'box', 'border-right-color', [128, 0, 128], 30],
+ [0.5, 'box', 'border-bottom-color', [128, 0, 128], 30],
+ [0.5, 'box', 'border-left-color', [128, 0, 128], 30],
+ [0.5, 'box', 'border-top-width', 10, 2],
+ [0.5, 'box', 'border-right-width', 10, 2],
+ [0.5, 'box', 'border-bottom-width', 10, 2],
+ [0.5, 'box', 'border-left-width', 10, 2],
// only border-width should be animating
- [0.25, 'box1', 'border-top-width', 10, 2],
- [0.25, 'box1', 'border-top-color', [255, 0, 255], 0], // initial value
+ [0.5, 'box1', 'border-top-width', 10, 2],
+ [0.5, 'box1', 'border-top-color', [255, 0, 255], 0], // initial value
// border-width should be animating
- [0.25, 'box2', 'border-top-width', 10, 2],
- [0.25, 'box2', 'border-bottom-width', 20, 4],
+ [0.5, 'box2', 'border-top-width', 10, 2],
+ [0.5, 'box2', 'border-bottom-width', 20, 4],
];
function setupTest()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list