2011-04-25 Simon Fraser <simon.fraser@apple.com>

        Reviewed by Daniel Bates.

        Move animation-test-helpers.js into resources directory
        https://bugs.webkit.org/show_bug.cgi?id=59365

        Move animation-test-helpers.js and fix the tests accordingly.

        * animations/3d/matrix-transform-type-animation.html:
        * animations/3d/transform-perspective.html:
        * animations/animation-direction.html:
        * animations/animation-drt-api-multiple-keyframes.html:
        * animations/animation-drt-api.html:
        * animations/animation-hit-test-transform.html:
        * animations/animation-hit-test.html:
        * animations/big-rotation.html:
        * animations/change-keyframes-name.html:
        * animations/change-keyframes.html:
        * animations/change-one-anim.html:
        * animations/combo-transform-rotate+scale.html:
        * animations/dynamic-stylesheet-loading.html:
        * animations/generic-from-to.html:
        * animations/import.html:
        * animations/keyframe-timing-functions-transform.html:
        * animations/keyframe-timing-functions.html:
        * animations/keyframe-timing-functions2.html:
        * animations/keyframes-comma-separated.html:
        * animations/keyframes-out-of-order.html:
        * animations/keyframes.html:
        * animations/lineheight-animation.html:
        * animations/longhand-timing-function.html:
        * animations/matrix-anim.html:
        * animations/missing-from-to-transforms.html:
        * animations/missing-from-to.html:
        * animations/missing-keyframe-properties-repeating.html:
        * animations/missing-keyframe-properties-timing-function.html:
        * animations/missing-keyframe-properties.html:
        * animations/missing-values-first-keyframe.html:
        * animations/missing-values-last-keyframe.html:
        * animations/multiple-animations.html:
        * animations/multiple-keyframes.html:
        * animations/negative-delay.html:
        * animations/opacity-transform-animation.html:
        * animations/play-state-suspend.html:
        * animations/play-state.html:
        * animations/resources/animation-test-helpers.js:
        (isCloseEnough):
        (matrixStringToArray):
        (checkExpectedValue):
        (endTest):
        (startTest):
        (runAnimationTest.else):
        (runAnimationTest):
        (waitForAnimationToStart):
        * animations/simultaneous-start-left.html:
        * animations/simultaneous-start-transform.html:
        * animations/stop-animation-on-suspend.html:
        * animations/suspend-resume-animation.html:
        * animations/timing-functions.html:
        * animations/transition-and-animation-1.html:
        * animations/transition-and-animation-2.html:
        * animations/transition-and-animation-3.html:
        * animations/unanimated-style.html:
        * animations/width-using-ems.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@84872 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 63b8af93
2011-04-25 Simon Fraser <simon.fraser@apple.com>
Reviewed by Daniel Bates.
Move animation-test-helpers.js into resources directory
https://bugs.webkit.org/show_bug.cgi?id=59365
Move animation-test-helpers.js and fix the tests accordingly.
* animations/3d/matrix-transform-type-animation.html:
* animations/3d/transform-perspective.html:
* animations/animation-direction.html:
* animations/animation-drt-api-multiple-keyframes.html:
* animations/animation-drt-api.html:
* animations/animation-hit-test-transform.html:
* animations/animation-hit-test.html:
* animations/big-rotation.html:
* animations/change-keyframes-name.html:
* animations/change-keyframes.html:
* animations/change-one-anim.html:
* animations/combo-transform-rotate+scale.html:
* animations/dynamic-stylesheet-loading.html:
* animations/generic-from-to.html:
* animations/import.html:
* animations/keyframe-timing-functions-transform.html:
* animations/keyframe-timing-functions.html:
* animations/keyframe-timing-functions2.html:
* animations/keyframes-comma-separated.html:
* animations/keyframes-out-of-order.html:
* animations/keyframes.html:
* animations/lineheight-animation.html:
* animations/longhand-timing-function.html:
* animations/matrix-anim.html:
* animations/missing-from-to-transforms.html:
* animations/missing-from-to.html:
* animations/missing-keyframe-properties-repeating.html:
* animations/missing-keyframe-properties-timing-function.html:
* animations/missing-keyframe-properties.html:
* animations/missing-values-first-keyframe.html:
* animations/missing-values-last-keyframe.html:
* animations/multiple-animations.html:
* animations/multiple-keyframes.html:
* animations/negative-delay.html:
* animations/opacity-transform-animation.html:
* animations/play-state-suspend.html:
* animations/play-state.html:
* animations/resources/animation-test-helpers.js:
(isCloseEnough):
(matrixStringToArray):
(checkExpectedValue):
(endTest):
(startTest):
(runAnimationTest.else):
(runAnimationTest):
(waitForAnimationToStart):
* animations/simultaneous-start-left.html:
* animations/simultaneous-start-transform.html:
* animations/stop-animation-on-suspend.html:
* animations/suspend-resume-animation.html:
* animations/timing-functions.html:
* animations/transition-and-animation-1.html:
* animations/transition-and-animation-2.html:
* animations/transition-and-animation-3.html:
* animations/unanimated-style.html:
* animations/width-using-ems.html:
2011-04-25 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r84864.
......@@ -31,7 +31,7 @@
to { -webkit-transform: matrix(1, 0, 0, 1, 0, 0); }
}
</style>
<script src="../animation-test-helpers.js" type="text/javascript"></script>
<script src="../resources/animation-test-helpers.js" type="text/javascript"></script>
<script type="text/javascript">
const expectedValues = [
// [animation, time, element-id, property, expected-value, tolerance]
......
......@@ -27,7 +27,7 @@
to { -webkit-transform: none; }
}
</style>
<script src="../animation-test-helpers.js" type="text/javascript"></script>
<script src="../resources/animation-test-helpers.js" type="text/javascript"></script>
<script type="text/javascript">
const expectedValues = [
// [time, element-id, property, expected-value, tolerance]
......
......@@ -33,7 +33,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -27,7 +27,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
layoutTestController.waitUntilDone();
......
......@@ -30,7 +30,7 @@
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
layoutTestController.waitUntilDone();
......
......@@ -29,7 +29,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
function checkResult(pos, isIn)
{
......
......@@ -29,7 +29,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
function checkResult(pos, isIn)
{
......
......@@ -18,7 +18,7 @@
to { -webkit-transform: rotate(540deg); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { left: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { left: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -27,7 +27,7 @@
to { top: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -19,7 +19,7 @@
to { -webkit-transform: rotate(360deg) scale(2,4); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<title>Test of dynamic stylesheet loading</title>
<link rel="stylesheet" href="resources/dynamic-stylesheet-insertion-main.css">
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -22,7 +22,7 @@
to { left: 200px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -19,7 +19,7 @@
-webkit-animation-name: "anim";
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -39,7 +39,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -34,7 +34,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -38,7 +38,7 @@
}
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { left: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -26,7 +26,7 @@
60% { left: 200px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -26,7 +26,7 @@
to { left: 300px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { line-height: 2em; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { left: 400px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
layoutTestController.waitUntilDone();
......
......@@ -19,7 +19,7 @@
to { -webkit-transform: matrix(0.707, 0.707, -0.707, 0.707, 0, 0); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
......
......@@ -69,7 +69,7 @@
margin-top: 20px;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -68,7 +68,7 @@
margin-top: 20px;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -31,7 +31,7 @@
/* Test reversing animation with missing values */
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -54,7 +54,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -44,7 +44,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -76,7 +76,7 @@
visibility: hidden; /* hide from pixel results */
}
</style>
<script src="animation-test-helpers.js" type="text/javascript"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript"></script>
<script type="text/javascript">
const expectedValues = [
......
......@@ -76,7 +76,7 @@
visibility: hidden; /* hide from pixel results */
}
</style>
<script src="animation-test-helpers.js" type="text/javascript"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript"></script>
<script type="text/javascript">
const expectedValues = [
......
......@@ -40,7 +40,7 @@
to { left: 20px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { left: 20px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -55,7 +55,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script>
// The delay of square1 is negative so square1 should be in ahead of square2.
......
......@@ -40,7 +40,7 @@
display: none; /* only the pixel output is valuable */
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -33,7 +33,7 @@
to { left: 400px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -33,7 +33,7 @@
to { left: 100px; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -29,7 +29,7 @@
background-color: red;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -29,7 +29,7 @@
background-color: red;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -27,7 +27,7 @@
to { -webkit-transform: translate3d(400px, 0px, 0px); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -17,7 +17,7 @@
to { -webkit-transform: translateX(500px); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -45,7 +45,7 @@
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -24,7 +24,7 @@
to { -webkit-transform: translateX(300px); }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -25,7 +25,7 @@
to { -webkit-transform: translate(400px, 100px) }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
......@@ -35,7 +35,7 @@
margin-top: 130px;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
......
......@@ -28,7 +28,7 @@
margin-top: 130px;
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
if (window.layoutTestController)
......
......@@ -27,7 +27,7 @@
to { width: 20em; }
}
</style>
<script src="animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
const expectedValues = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment