Bug 1398038 - Split keyframe-tests.js out of keyframe-utils.js; r?hiro draft
authorBrian Birtles <birtles@gmail.com>
Wed, 18 Oct 2017 14:12:02 +0900
changeset 683754 85e7605dc3d55632074902e37955b17d782ab269
parent 683753 9eb492e1a6fb0a6503ec698886a2bb05bdf9e08a
child 683755 0cca0bdff94dfe6e5d470a2267b096a408c00d4d
push id85456
push userbmo:bbirtles@mozilla.com
push dateFri, 20 Oct 2017 06:31:55 +0000
reviewershiro
bugs1398038
milestone58.0a1
Bug 1398038 - Split keyframe-tests.js out of keyframe-utils.js; r?hiro It doesn't really make sense to have test data in a file call 'utils'. MozReview-Commit-ID: BTMbeZKnvtJ
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/web-animations/interfaces/Animatable/animate.html
testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html
testing/web-platform/tests/web-animations/resources/keyframe-tests.js
testing/web-platform/tests/web-animations/resources/keyframe-utils.js
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -309390,16 +309390,21 @@
      {}
     ]
    ],
    "web-animations/resources/effect-tests.js": [
     [
      {}
     ]
    ],
+   "web-animations/resources/keyframe-tests.js": [
+    [
+     {}
+    ]
+   ],
    "web-animations/resources/keyframe-utils.js": [
     [
      {}
     ]
    ],
    "web-animations/resources/xhr-doc.py": [
     [
      {}
@@ -631161,17 +631166,17 @@
    "b01c7c5145c183fdca80dec4ca1966b0f72a7003",
    "testharness"
   ],
   "web-animations/interfaces/Animatable/animate-no-browsing-context.html": [
    "3a5538db728127970721e20e3b2eaea59fac3afc",
    "testharness"
   ],
   "web-animations/interfaces/Animatable/animate.html": [
-   "5f50ca1e8ab1fecdc6594310b4e386eec4738c6b",
+   "20339be998b601f34e6b4d676c681ce3a16a464e",
    "testharness"
   ],
   "web-animations/interfaces/Animatable/getAnimations.html": [
    "92503fce725fcffce188df9c8e1da9d9ca281213",
    "testharness"
   ],
   "web-animations/interfaces/Animation/cancel.html": [
    "a28589129c6a2665295695f786b7beb2dd887fb3",
@@ -631289,17 +631294,17 @@
    "3a626b145f4eb77e816b9020f6fc67630088a00b",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/composite.html": [
    "2580086b2da9b29d1645484c5ad4e59636a370e5",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/constructor.html": [
-   "86150c0555de0c2c10816f7970aed1a24918b2d5",
+   "d382ddbbd6d9f84322d1a3e7b29e0c93f921e4fe",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/copy-constructor.html": [
    "e1dfb5c05807a37974ecce98bb8c683cc291bfe4",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/getComputedTiming.html": [
    "c9dcf7c17010e5495007e000b33aeb4dc89f92b7",
@@ -631313,17 +631318,17 @@
    "83e58d986208b6cbc51e4124a2b17269a26e0520",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/processing-a-keyframes-argument-002.html": [
    "38b350320a08cc2a9ae4449944eea427bfbe6f9d",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/setKeyframes.html": [
-   "2982bb6f57bb52c6e4e0483e4e47b22868a6010d",
+   "8ef313bf46f963a5c0497374a058d05b702e7e11",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/setTarget.html": [
    "8c75e6605a134c96e261e5383414b7e15b32d121",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffectReadOnly/copy-constructor.html": [
    "8ef986f13e7fe7ffeb7403f647b4169ac0d6a138",
@@ -631332,18 +631337,22 @@
   "web-animations/resources/easing-tests.js": [
    "c255d606d00296b4c6957435773a20a9d8d0bd0b",
    "support"
   ],
   "web-animations/resources/effect-tests.js": [
    "aed87c03ac50e534532855612a7bb05092a7e4e7",
    "support"
   ],
+  "web-animations/resources/keyframe-tests.js": [
+   "d19e526bb655bc21bbb1434404fa7fc094f3d593",
+   "support"
+  ],
   "web-animations/resources/keyframe-utils.js": [
-   "a9c574e206087c02834e9836ea7625d843427a17",
+   "486e975e10a00c6e01e9c930ef5581f498a2ddb5",
    "support"
   ],
   "web-animations/resources/xhr-doc.py": [
    "de68c45fc1d38a49946f9046f34031e9278a1531",
    "support"
   ],
   "web-animations/testcommon.js": [
    "d057ad66c4561ef32f83770e4948f2019da89d48",
--- a/testing/web-platform/tests/web-animations/interfaces/Animatable/animate.html
+++ b/testing/web-platform/tests/web-animations/interfaces/Animatable/animate.html
@@ -2,16 +2,17 @@
 <meta charset=utf-8>
 <title>Animatable.animate tests</title>
 <link rel="help" href="https://w3c.github.io/web-animations/#dom-animatable-animate">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../../testcommon.js"></script>
 <script src="../../resources/easing-tests.js"></script>
 <script src="../../resources/keyframe-utils.js"></script>
+<script src="../../resources/keyframe-tests.js"></script>
 <body>
 <div id="log"></div>
 <iframe width="10" height="10" id="iframe"></iframe>
 <script>
 'use strict';
 
 // Tests on Element
 
--- a/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
+++ b/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
@@ -2,16 +2,17 @@
 <meta charset=utf-8>
 <title>KeyframeEffectReadOnly constructor tests</title>
 <link rel="help" href="https://w3c.github.io/web-animations/#the-keyframeeffect-interfaces">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../../testcommon.js"></script>
 <script src="../../resources/easing-tests.js"></script>
 <script src="../../resources/keyframe-utils.js"></script>
+<script src="../../resources/keyframe-tests.js"></script>
 <body>
 <div id="log"></div>
 <div id="target"></div>
 <style>
 #target {
   border-style: solid;  /* so border-*-width values don't compute to 0 */
 }
 </style>
--- a/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html
+++ b/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/setKeyframes.html
@@ -1,16 +1,17 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>KeyframeEffect setKeyframes() tests</title>
 <link rel="help" href="https://w3c.github.io/web-animations/#dom-keyframeeffect-setkeyframes">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../../testcommon.js"></script>
 <script src="../../resources/keyframe-utils.js"></script>
+<script src="../../resources/keyframe-tests.js"></script>
 <body>
 <div id="log"></div>
 <div id="target"></div>
 <script>
 'use strict';
 
 var target = document.getElementById('target');
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/web-animations/resources/keyframe-tests.js
@@ -0,0 +1,533 @@
+"use strict";
+
+// ==============================
+//
+// Common keyframe test data
+//
+// ==============================
+
+
+// ------------------------------
+//  Composite values
+// ------------------------------
+
+var gGoodKeyframeCompositeValueTests = [
+  "replace", "add", "accumulate", undefined
+];
+
+var gGoodOptionsCompositeValueTests = [
+  "replace", "add", "accumulate"
+];
+
+var gBadCompositeValueTests = [
+  "unrecognised", "replace ", "Replace", null
+];
+
+// ------------------------------
+//  Keyframes
+// ------------------------------
+
+var gEmptyKeyframeListTests = [
+  [],
+  null,
+  undefined,
+];
+
+var gPropertyIndexedKeyframesTests = [
+  { desc:   "a one property two value property-indexed keyframes specification",
+    input:  { left: ["10px", "20px"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               left: "10px" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               left: "20px" }] },
+  { desc:   "a one shorthand property two value property-indexed keyframes"
+            + " specification",
+    input:  { margin: ["10px", "10px 20px 30px 40px"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               margin: "10px" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               margin: "10px 20px 30px 40px" }] },
+  { desc:   "a two property (one shorthand and one of its longhand components)"
+            + " two value property-indexed keyframes specification",
+    input:  { marginTop: ["50px", "60px"],
+              margin: ["10px", "10px 20px 30px 40px"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               marginTop: "50px", margin: "10px" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               marginTop: "60px", margin: "10px 20px 30px 40px" }] },
+  { desc:   "a two property two value property-indexed keyframes specification",
+    input:  { left: ["10px", "20px"],
+              top: ["30px", "40px"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               left: "10px", top: "30px" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               left: "20px", top: "40px" }] },
+  { desc:   "a two property property-indexed keyframes specification with"
+            + " different numbers of values",
+    input:  { left: ["10px", "20px", "30px"],
+              top: ["40px", "50px"] },
+    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
+               left: "10px", top: "40px" },
+             { offset: null, computedOffset: 0.5, easing: "linear",
+               left: "20px" },
+             { offset: null, computedOffset: 1.0, easing: "linear",
+               left: "30px", top: "50px" }] },
+  { desc:   "a property-indexed keyframes specification with an invalid value",
+    input:  { left: ["10px", "20px", "30px", "40px", "50px"],
+              top:  ["15px", "25px", "invalid", "45px", "55px"] },
+    output: [{ offset: null, computedOffset: 0.00, easing: "linear",
+               left: "10px", top: "15px" },
+             { offset: null, computedOffset: 0.25, easing: "linear",
+               left: "20px", top: "25px" },
+             { offset: null, computedOffset: 0.50, easing: "linear",
+               left: "30px" },
+             { offset: null, computedOffset: 0.75, easing: "linear",
+               left: "40px", top: "45px" },
+             { offset: null, computedOffset: 1.00, easing: "linear",
+               left: "50px", top: "55px" }] },
+  { desc:   "a one property two value property-indexed keyframes specification"
+            + " that needs to stringify its values",
+    input:  { opacity: [0, 1] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               opacity: "0" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               opacity: "1" }] },
+  { desc:   "a property-indexed keyframes specification with a CSS variable"
+            + " reference",
+    input:  { left: [ "var(--dist)", "calc(var(--dist) + 100px)" ] },
+    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
+               left: "var(--dist)" },
+             { offset: null, computedOffset: 1.0, easing: "linear",
+               left: "calc(var(--dist) + 100px)" }] },
+  { desc:   "a property-indexed keyframes specification with a CSS variable"
+            + " reference in a shorthand property",
+    input:  { margin: [ "var(--dist)", "calc(var(--dist) + 100px)" ] },
+    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
+               margin: "var(--dist)" },
+             { offset: null, computedOffset: 1.0, easing: "linear",
+               margin: "calc(var(--dist) + 100px)" }] },
+  { desc:   "a one property one value property-indexed keyframes specification",
+    input:  { left: ["10px"] },
+    output: [{ offset: null, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a one property one non-array value property-indexed keyframes"
+            + " specification",
+    input:  { left: "10px" },
+    output: [{ offset: null, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a one property two value property-indexed keyframes specification"
+            + " where the first value is invalid",
+    input:  { left: ["invalid", "10px"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear" },
+             { offset: null, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a one property two value property-indexed keyframes specification"
+            + " where the second value is invalid",
+    input:  { left: ["10px", "invalid"] },
+    output: [{ offset: null, computedOffset: 0, easing: "linear",
+               left: "10px" },
+             { offset: null, computedOffset: 1, easing: "linear" }] },
+];
+
+var gKeyframeSequenceTests = [
+  { desc:   "a one property one keyframe sequence",
+    input:  [{ offset: 1, left: "10px" }],
+    output: [{ offset: 1, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a one property two keyframe sequence",
+    input:  [{ offset: 0, left: "10px" },
+             { offset: 1, left: "20px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
+             { offset: 1, computedOffset: 1, easing: "linear", left: "20px" }]
+  },
+  { desc:   "a two property two keyframe sequence",
+    input:  [{ offset: 0, left: "10px", top: "30px" },
+             { offset: 1, left: "20px", top: "40px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               left: "10px", top: "30px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               left: "20px", top: "40px" }] },
+  { desc:   "a one shorthand property two keyframe sequence",
+    input:  [{ offset: 0, margin: "10px" },
+             { offset: 1, margin: "20px 30px 40px 50px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               margin: "10px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               margin: "20px 30px 40px 50px" }] },
+  { desc:   "a two property (a shorthand and one of its component longhands)"
+            + " two keyframe sequence",
+    input:  [{ offset: 0, margin: "10px", marginTop: "20px" },
+             { offset: 1, marginTop: "70px", margin: "30px 40px 50px 60px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               margin: "10px", marginTop: "20px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               marginTop: "70px", margin: "30px 40px 50px 60px" }] },
+  { desc:   "a keyframe sequence with duplicate values for a given interior"
+            + " offset",
+    input:  [{ offset: 0.0, left: "10px" },
+             { offset: 0.5, left: "20px" },
+             { offset: 0.5, left: "30px" },
+             { offset: 0.5, left: "40px" },
+             { offset: 1.0, left: "50px" }],
+    output: [{ offset: 0.0, computedOffset: 0.0, easing: "linear",
+               left: "10px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "20px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "30px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "40px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "linear",
+               left: "50px" }] },
+  { desc:   "a keyframe sequence with duplicate values for offsets 0 and 1",
+    input:  [{ offset: 0, left: "10px" },
+             { offset: 0, left: "20px" },
+             { offset: 0, left: "30px" },
+             { offset: 1, left: "40px" },
+             { offset: 1, left: "50px" },
+             { offset: 1, left: "60px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
+             { offset: 0, computedOffset: 0, easing: "linear", left: "20px" },
+             { offset: 0, computedOffset: 0, easing: "linear", left: "30px" },
+             { offset: 1, computedOffset: 1, easing: "linear", left: "40px" },
+             { offset: 1, computedOffset: 1, easing: "linear", left: "50px" },
+             { offset: 1, computedOffset: 1, easing: "linear", left: "60px" }]
+  },
+  { desc:   "a two property four keyframe sequence",
+    input:  [{ offset: 0, left: "10px" },
+             { offset: 0, top: "20px" },
+             { offset: 1, top: "30px" },
+             { offset: 1, left: "40px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
+             { offset: 0, computedOffset: 0, easing: "linear", top: "20px" },
+             { offset: 1, computedOffset: 1, easing: "linear", top: "30px" },
+             { offset: 1, computedOffset: 1, easing: "linear", left: "40px" }]
+  },
+  { desc:   "a single keyframe sequence with omitted offset",
+    input:  [{ left: "10px" }],
+    output: [{ offset: null, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a single keyframe sequence with null offset",
+    input:  [{ offset: null, left: "10px" }],
+    output: [{ offset: null, computedOffset: 1, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a single keyframe sequence with string offset",
+    input:  [{ offset: '0.5', left: "10px" }],
+    output: [{ offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "10px" }] },
+  { desc:   "a one property keyframe sequence with some omitted offsets",
+    input:  [{ offset: 0.00, left: "10px" },
+             { offset: 0.25, left: "20px" },
+             { left: "30px" },
+             { left: "40px" },
+             { offset: 1.00, left: "50px" }],
+    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
+               left: "10px" },
+             { offset: 0.25, computedOffset: 0.25, easing: "linear",
+               left: "20px" },
+             { offset: null, computedOffset: 0.50, easing: "linear",
+               left: "30px" },
+             { offset: null, computedOffset: 0.75, easing: "linear",
+               left: "40px" },
+             { offset: 1.00, computedOffset: 1.00, easing: "linear",
+               left: "50px" }] },
+  { desc:   "a one property keyframe sequence with some null offsets",
+    input:  [{ offset: 0.00, left: "10px" },
+             { offset: 0.25, left: "20px" },
+             { offset: null, left: "30px" },
+             { offset: null, left: "40px" },
+             { offset: 1.00, left: "50px" }],
+    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
+               left: "10px" },
+             { offset: 0.25, computedOffset: 0.25, easing: "linear",
+               left: "20px" },
+             { offset: null, computedOffset: 0.50, easing: "linear",
+               left: "30px" },
+             { offset: null, computedOffset: 0.75, easing: "linear",
+               left: "40px" },
+             { offset: 1.00, computedOffset: 1.00, easing: "linear",
+               left: "50px" }] },
+  { desc:   "a two property keyframe sequence with some omitted offsets",
+    input:  [{ offset: 0.00, left: "10px", top: "20px" },
+             { offset: 0.25, left: "30px" },
+             { left: "40px" },
+             { left: "50px", top: "60px" },
+             { offset: 1.00, left: "70px", top: "80px" }],
+    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
+               left: "10px", top: "20px" },
+             { offset: 0.25, computedOffset: 0.25, easing: "linear",
+               left: "30px" },
+             { offset: null, computedOffset: 0.50, easing: "linear",
+               left: "40px" },
+             { offset: null, computedOffset: 0.75, easing: "linear",
+               left: "50px", top: "60px" },
+             { offset: 1.00, computedOffset: 1.00, easing: "linear",
+               left: "70px", top: "80px" }] },
+  { desc:   "a one property keyframe sequence with all omitted offsets",
+    input:  [{ left: "10px" },
+             { left: "20px" },
+             { left: "30px" },
+             { left: "40px" },
+             { left: "50px" }],
+    output: [{ offset: null, computedOffset: 0.00, easing: "linear",
+               left: "10px" },
+             { offset: null, computedOffset: 0.25, easing: "linear",
+               left: "20px" },
+             { offset: null, computedOffset: 0.50, easing: "linear",
+               left: "30px" },
+             { offset: null, computedOffset: 0.75, easing: "linear",
+               left: "40px" },
+             { offset: null, computedOffset: 1.00, easing: "linear",
+               left: "50px" }] },
+  { desc:   "a keyframe sequence with different easing values, but the same"
+            + " easing value for a given offset",
+    input:  [{ offset: 0.0, easing: "ease",     left: "10px"},
+             { offset: 0.0, easing: "ease",     top: "20px"},
+             { offset: 0.5, easing: "linear",   left: "30px" },
+             { offset: 0.5, easing: "linear",   top: "40px" },
+             { offset: 1.0, easing: "step-end", left: "50px" },
+             { offset: 1.0, easing: "step-end", top: "60px" }],
+    output: [{ offset: 0.0, computedOffset: 0.0, easing: "ease",
+               left: "10px" },
+             { offset: 0.0, computedOffset: 0.0, easing: "ease",
+               top: "20px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "30px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               top: "40px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
+               left: "50px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
+               top: "60px" }] },
+  { desc:   "a keyframe sequence with different composite values, but the"
+            + " same composite value for a given offset",
+    input:  [{ offset: 0.0, composite: "replace", left: "10px" },
+             { offset: 0.0, composite: "replace", top: "20px" },
+             { offset: 0.5, composite: "add",     left: "30px" },
+             { offset: 0.5, composite: "add",     top: "40px" },
+             { offset: 1.0, composite: "replace", left: "50px" },
+             { offset: 1.0, composite: "replace", top: "60px" }],
+    output: [{ offset: 0.0, computedOffset: 0.0, easing: "linear",
+               composite: "replace", left: "10px" },
+             { offset: 0.0, computedOffset: 0.0, easing: "linear",
+               composite: "replace", top: "20px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               composite: "add", left: "30px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               composite: "add", top: "40px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "linear",
+               composite: "replace", left: "50px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "linear",
+               composite: "replace", top: "60px" }] },
+  { desc:   "a one property two keyframe sequence that needs to stringify"
+            + " its values",
+    input:  [{ offset: 0, opacity: 0 },
+             { offset: 1, opacity: 1 }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear", opacity: "0" },
+             { offset: 1, computedOffset: 1, easing: "linear", opacity: "1" }]
+  },
+  { desc:   "a keyframe sequence with a CSS variable reference",
+    input:  [{ left: "var(--dist)" },
+             { left: "calc(var(--dist) + 100px)" }],
+    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
+               left: "var(--dist)" },
+             { offset: null, computedOffset: 1.0, easing: "linear",
+               left: "calc(var(--dist) + 100px)" }] },
+  { desc:   "a keyframe sequence with a CSS variable reference in a shorthand"
+            + " property",
+    input:  [{ margin: "var(--dist)" },
+             { margin: "calc(var(--dist) + 100px)" }],
+    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
+               margin: "var(--dist)" },
+             { offset: null, computedOffset: 1.0, easing: "linear",
+               margin: "calc(var(--dist) + 100px)" }] },
+  { desc:   "a keyframe sequence where shorthand precedes longhand",
+    input:  [{ offset: 0, margin: "10px", marginRight: "20px" },
+             { offset: 1, margin: "30px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               margin: "10px", marginRight: "20px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               margin: "30px" }] },
+  { desc:   "a keyframe sequence where longhand precedes shorthand",
+    input:  [{ offset: 0, marginRight: "20px", margin: "10px" },
+             { offset: 1, margin: "30px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               marginRight: "20px", margin: "10px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               margin: "30px" }] },
+  { desc:   "a keyframe sequence where lesser shorthand precedes greater"
+            + " shorthand",
+    input:  [{ offset: 0,
+               borderLeft: "1px solid rgb(1, 2, 3)",
+               border: "2px dotted rgb(4, 5, 6)" },
+             { offset: 1, border: "3px dashed rgb(7, 8, 9)" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               borderLeft: "1px solid rgb(1, 2, 3)",
+               border: "2px dotted rgb(4, 5, 6)" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               border: "3px dashed rgb(7, 8, 9)" }] },
+  { desc:   "a keyframe sequence where greater shorthand precedes lesser"
+            + " shorthand",
+    input:  [{ offset: 0, border: "2px dotted rgb(4, 5, 6)",
+               borderLeft: "1px solid rgb(1, 2, 3)" },
+             { offset: 1, border: "3px dashed rgb(7, 8, 9)" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               border: "2px dotted rgb(4, 5, 6)",
+               borderLeft: "1px solid rgb(1, 2, 3)" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               border: "3px dashed rgb(7, 8, 9)" }] },
+  { desc:   "a two property keyframe sequence where one property is missing"
+            + " from the first keyframe",
+    input:  [{ offset: 0, left: "10px" },
+             { offset: 1, left: "20px", top: "30px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               left: "20px", top: "30px" }] },
+  { desc:   "a two property keyframe sequence where one property is missing"
+            + " from the last keyframe",
+    input:  [{ offset: 0, left: "10px", top: "20px" },
+             { offset: 1, left: "30px" }],
+    output: [{ offset: 0, computedOffset: 0, easing: "linear",
+               left: "10px" , top: "20px" },
+             { offset: 1, computedOffset: 1, easing: "linear",
+               left: "30px" }] },
+  { desc:   "a keyframe sequence with repeated values at offset 1 with"
+            + " different easings",
+    input:  [{ offset: 0.0, left: "100px", easing: "ease" },
+             { offset: 0.0, left: "200px", easing: "ease" },
+             { offset: 0.5, left: "300px", easing: "linear" },
+             { offset: 1.0, left: "400px", easing: "ease-out" },
+             { offset: 1.0, left: "500px", easing: "step-end" }],
+    output: [{ offset: 0.0, computedOffset: 0.0, easing: "ease",
+               left: "100px" },
+             { offset: 0.0, computedOffset: 0.0, easing: "ease",
+               left: "200px" },
+             { offset: 0.5, computedOffset: 0.5, easing: "linear",
+               left: "300px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "ease-out",
+               left: "400px" },
+             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
+               left: "500px" }] },
+];
+
+var gInvalidKeyframesTests = [
+  { desc:     "keyframes with an out-of-bounded positive offset",
+    input:    [ { opacity: 0 },
+                { opacity: 0.5, offset: 2 },
+                { opacity: 1 } ],
+    expected: { name: "TypeError" } },
+  { desc:     "keyframes with an out-of-bounded negative offset",
+    input:    [ { opacity: 0 },
+                { opacity: 0.5, offset: -1 },
+                { opacity: 1 } ],
+    expected: { name: "TypeError" } },
+  { desc:     "keyframes not loosely sorted by offset",
+    input:    [ { opacity: 0, offset: 1 },
+                { opacity: 1, offset: 0 } ],
+    expected: { name: "TypeError" } },
+  { desc:     "property-indexed keyframes with an invalid easing value",
+    input:    { opacity: [ 0, 0.5, 1 ],
+                easing: "inherit" },
+    expected: { name: "TypeError" } },
+  { desc:     "a keyframe sequence with an invalid easing value",
+    input:    [ { opacity: 0, easing: "jumpy" },
+                { opacity: 1 } ],
+    expected: { name: "TypeError" } },
+  { desc:     "keyframes with an invalid composite value",
+    input:    [ { opacity: 0, composite: "alternate" },
+                { opacity: 1 } ],
+    expected: { name: "TypeError" } }
+];
+
+// ------------------------------
+//  KeyframeEffectOptions
+// ------------------------------
+
+var gKeyframeEffectOptionTests = [
+  { desc:     "an empty KeyframeEffectOptions object",
+    input:    { },
+    expected: { } },
+  { desc:     "a normal KeyframeEffectOptions object",
+    input:    { delay: 1000,
+                fill: "auto",
+                iterations: 5.5,
+                duration: "auto",
+                direction: "alternate" },
+    expected: { delay: 1000,
+                fill: "auto",
+                iterations: 5.5,
+                duration: "auto",
+                direction: "alternate" } },
+  { desc:     "a double value",
+    input:    3000,
+    expected: { duration: 3000 } },
+  { desc:     "+Infinity",
+    input:    Infinity,
+    expected: { duration: Infinity } },
+  { desc:     "an Infinity duration",
+    input:    { duration: Infinity },
+    expected: { duration: Infinity } },
+  { desc:     "an auto duration",
+    input:    { duration: "auto" },
+    expected: { duration: "auto" } },
+  { desc:     "an Infinity iterations",
+    input:    { iterations: Infinity },
+    expected: { iterations: Infinity } },
+  { desc:     "an auto fill",
+    input:    { fill: "auto" },
+    expected: { fill: "auto" } },
+  { desc:     "a forwards fill",
+    input:    { fill: "forwards" },
+    expected: { fill: "forwards" } }
+];
+
+var gInvalidKeyframeEffectOptionTests = [
+  { desc:     "-Infinity",
+    input:    -Infinity,
+    expected: { name: "TypeError" } },
+  { desc:     "NaN",
+    input:    NaN,
+    expected: { name: "TypeError" } },
+  { desc:     "a negative value",
+    input:    -1,
+    expected: { name: "TypeError" } },
+  { desc:     "a negative Infinity duration",
+    input:    { duration: -Infinity },
+    expected: { name: "TypeError" } },
+  { desc:     "a NaN duration",
+    input:    { duration: NaN },
+    expected: { name: "TypeError" } },
+  { desc:     "a negative duration",
+    input:    { duration: -1 },
+    expected: { name: "TypeError" } },
+  { desc:     "a string duration",
+    input:    { duration: "merrychristmas" },
+    expected: { name: "TypeError" } },
+  { desc:     "a negative Infinity iterations",
+    input:    { iterations: -Infinity},
+    expected: { name: "TypeError" } },
+  { desc:     "a NaN iterations",
+    input:    { iterations: NaN },
+    expected: { name: "TypeError" } },
+  { desc:     "a negative iterations",
+    input:    { iterations: -1 },
+    expected: { name: "TypeError" } },
+  { desc:     "a blank easing",
+    input:    { easing: "" },
+    expected: { name: "TypeError" } },
+  { desc:     "an unrecognized easing",
+    input:    { easing: "unrecognised" },
+    expected: { name: "TypeError" } },
+  { desc:     "an 'initial' easing",
+    input:    { easing: "initial" },
+    expected: { name: "TypeError" } },
+  { desc:     "an 'inherit' easing",
+    input:    { easing: "inherit" },
+    expected: { name: "TypeError" } },
+  { desc:     "a variable easing",
+    input:    { easing: "var(--x)" },
+    expected: { name: "TypeError" } },
+  { desc:     "a multi-value easing",
+    input:    { easing: "ease-in-out, ease-out" },
+    expected: { name: "TypeError" } }
+];
--- a/testing/web-platform/tests/web-animations/resources/keyframe-utils.js
+++ b/testing/web-platform/tests/web-animations/resources/keyframe-utils.js
@@ -1,11 +1,16 @@
 "use strict";
 
-// Utility functions and common keyframe test data.
+// =======================================
+//
+// Utility functions for testing keyframes
+//
+// =======================================
+
 
 // ------------------------------
 //  Helper functions
 // ------------------------------
 
 /**
  * Test equality between two lists of computed keyframes
  * @param {Array.<ComputedKeyframe>} a - actual computed keyframes
@@ -13,542 +18,17 @@
  */
 function assert_frame_lists_equal(a, b) {
   assert_equals(a.length, b.length, "number of frames");
   for (var i = 0; i < Math.min(a.length, b.length); i++) {
     assert_frames_equal(a[i], b[i], "ComputedKeyframe #" + i);
   }
 }
 
-/** Helper */
+/** Helper for assert_frame_lists_equal */
 function assert_frames_equal(a, b, name) {
   assert_equals(Object.keys(a).sort().toString(),
                 Object.keys(b).sort().toString(),
                 "properties on " + name);
   for (var p in a) {
     assert_equals(a[p], b[p], "value for '" + p + "' on " + name);
   }
 }
-
-// ------------------------------
-//  Composite values
-// ------------------------------
-
-var gGoodKeyframeCompositeValueTests = [
-  "replace", "add", "accumulate", undefined
-];
-
-var gGoodOptionsCompositeValueTests = [
-  "replace", "add", "accumulate"
-];
-
-var gBadCompositeValueTests = [
-  "unrecognised", "replace ", "Replace", null
-];
-
-// ------------------------------
-//  Keyframes
-// ------------------------------
-
-var gEmptyKeyframeListTests = [
-  [],
-  null,
-  undefined,
-];
-
-var gPropertyIndexedKeyframesTests = [
-  { desc:   "a one property two value property-indexed keyframes specification",
-    input:  { left: ["10px", "20px"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               left: "10px" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               left: "20px" }] },
-  { desc:   "a one shorthand property two value property-indexed keyframes"
-            + " specification",
-    input:  { margin: ["10px", "10px 20px 30px 40px"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               margin: "10px" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               margin: "10px 20px 30px 40px" }] },
-  { desc:   "a two property (one shorthand and one of its longhand components)"
-            + " two value property-indexed keyframes specification",
-    input:  { marginTop: ["50px", "60px"],
-              margin: ["10px", "10px 20px 30px 40px"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               marginTop: "50px", margin: "10px" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               marginTop: "60px", margin: "10px 20px 30px 40px" }] },
-  { desc:   "a two property two value property-indexed keyframes specification",
-    input:  { left: ["10px", "20px"],
-              top: ["30px", "40px"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               left: "10px", top: "30px" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               left: "20px", top: "40px" }] },
-  { desc:   "a two property property-indexed keyframes specification with"
-            + " different numbers of values",
-    input:  { left: ["10px", "20px", "30px"],
-              top: ["40px", "50px"] },
-    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
-               left: "10px", top: "40px" },
-             { offset: null, computedOffset: 0.5, easing: "linear",
-               left: "20px" },
-             { offset: null, computedOffset: 1.0, easing: "linear",
-               left: "30px", top: "50px" }] },
-  { desc:   "a property-indexed keyframes specification with an invalid value",
-    input:  { left: ["10px", "20px", "30px", "40px", "50px"],
-              top:  ["15px", "25px", "invalid", "45px", "55px"] },
-    output: [{ offset: null, computedOffset: 0.00, easing: "linear",
-               left: "10px", top: "15px" },
-             { offset: null, computedOffset: 0.25, easing: "linear",
-               left: "20px", top: "25px" },
-             { offset: null, computedOffset: 0.50, easing: "linear",
-               left: "30px" },
-             { offset: null, computedOffset: 0.75, easing: "linear",
-               left: "40px", top: "45px" },
-             { offset: null, computedOffset: 1.00, easing: "linear",
-               left: "50px", top: "55px" }] },
-  { desc:   "a one property two value property-indexed keyframes specification"
-            + " that needs to stringify its values",
-    input:  { opacity: [0, 1] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               opacity: "0" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               opacity: "1" }] },
-  { desc:   "a property-indexed keyframes specification with a CSS variable"
-            + " reference",
-    input:  { left: [ "var(--dist)", "calc(var(--dist) + 100px)" ] },
-    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
-               left: "var(--dist)" },
-             { offset: null, computedOffset: 1.0, easing: "linear",
-               left: "calc(var(--dist) + 100px)" }] },
-  { desc:   "a property-indexed keyframes specification with a CSS variable"
-            + " reference in a shorthand property",
-    input:  { margin: [ "var(--dist)", "calc(var(--dist) + 100px)" ] },
-    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
-               margin: "var(--dist)" },
-             { offset: null, computedOffset: 1.0, easing: "linear",
-               margin: "calc(var(--dist) + 100px)" }] },
-  { desc:   "a one property one value property-indexed keyframes specification",
-    input:  { left: ["10px"] },
-    output: [{ offset: null, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a one property one non-array value property-indexed keyframes"
-            + " specification",
-    input:  { left: "10px" },
-    output: [{ offset: null, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a one property two value property-indexed keyframes specification"
-            + " where the first value is invalid",
-    input:  { left: ["invalid", "10px"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear" },
-             { offset: null, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a one property two value property-indexed keyframes specification"
-            + " where the second value is invalid",
-    input:  { left: ["10px", "invalid"] },
-    output: [{ offset: null, computedOffset: 0, easing: "linear",
-               left: "10px" },
-             { offset: null, computedOffset: 1, easing: "linear" }] },
-];
-
-var gKeyframeSequenceTests = [
-  { desc:   "a one property one keyframe sequence",
-    input:  [{ offset: 1, left: "10px" }],
-    output: [{ offset: 1, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a one property two keyframe sequence",
-    input:  [{ offset: 0, left: "10px" },
-             { offset: 1, left: "20px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
-             { offset: 1, computedOffset: 1, easing: "linear", left: "20px" }]
-  },
-  { desc:   "a two property two keyframe sequence",
-    input:  [{ offset: 0, left: "10px", top: "30px" },
-             { offset: 1, left: "20px", top: "40px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               left: "10px", top: "30px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               left: "20px", top: "40px" }] },
-  { desc:   "a one shorthand property two keyframe sequence",
-    input:  [{ offset: 0, margin: "10px" },
-             { offset: 1, margin: "20px 30px 40px 50px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               margin: "10px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               margin: "20px 30px 40px 50px" }] },
-  { desc:   "a two property (a shorthand and one of its component longhands)"
-            + " two keyframe sequence",
-    input:  [{ offset: 0, margin: "10px", marginTop: "20px" },
-             { offset: 1, marginTop: "70px", margin: "30px 40px 50px 60px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               margin: "10px", marginTop: "20px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               marginTop: "70px", margin: "30px 40px 50px 60px" }] },
-  { desc:   "a keyframe sequence with duplicate values for a given interior"
-            + " offset",
-    input:  [{ offset: 0.0, left: "10px" },
-             { offset: 0.5, left: "20px" },
-             { offset: 0.5, left: "30px" },
-             { offset: 0.5, left: "40px" },
-             { offset: 1.0, left: "50px" }],
-    output: [{ offset: 0.0, computedOffset: 0.0, easing: "linear",
-               left: "10px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "20px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "30px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "40px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "linear",
-               left: "50px" }] },
-  { desc:   "a keyframe sequence with duplicate values for offsets 0 and 1",
-    input:  [{ offset: 0, left: "10px" },
-             { offset: 0, left: "20px" },
-             { offset: 0, left: "30px" },
-             { offset: 1, left: "40px" },
-             { offset: 1, left: "50px" },
-             { offset: 1, left: "60px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
-             { offset: 0, computedOffset: 0, easing: "linear", left: "20px" },
-             { offset: 0, computedOffset: 0, easing: "linear", left: "30px" },
-             { offset: 1, computedOffset: 1, easing: "linear", left: "40px" },
-             { offset: 1, computedOffset: 1, easing: "linear", left: "50px" },
-             { offset: 1, computedOffset: 1, easing: "linear", left: "60px" }]
-  },
-  { desc:   "a two property four keyframe sequence",
-    input:  [{ offset: 0, left: "10px" },
-             { offset: 0, top: "20px" },
-             { offset: 1, top: "30px" },
-             { offset: 1, left: "40px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
-             { offset: 0, computedOffset: 0, easing: "linear", top: "20px" },
-             { offset: 1, computedOffset: 1, easing: "linear", top: "30px" },
-             { offset: 1, computedOffset: 1, easing: "linear", left: "40px" }]
-  },
-  { desc:   "a single keyframe sequence with omitted offset",
-    input:  [{ left: "10px" }],
-    output: [{ offset: null, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a single keyframe sequence with null offset",
-    input:  [{ offset: null, left: "10px" }],
-    output: [{ offset: null, computedOffset: 1, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a single keyframe sequence with string offset",
-    input:  [{ offset: '0.5', left: "10px" }],
-    output: [{ offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "10px" }] },
-  { desc:   "a one property keyframe sequence with some omitted offsets",
-    input:  [{ offset: 0.00, left: "10px" },
-             { offset: 0.25, left: "20px" },
-             { left: "30px" },
-             { left: "40px" },
-             { offset: 1.00, left: "50px" }],
-    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
-               left: "10px" },
-             { offset: 0.25, computedOffset: 0.25, easing: "linear",
-               left: "20px" },
-             { offset: null, computedOffset: 0.50, easing: "linear",
-               left: "30px" },
-             { offset: null, computedOffset: 0.75, easing: "linear",
-               left: "40px" },
-             { offset: 1.00, computedOffset: 1.00, easing: "linear",
-               left: "50px" }] },
-  { desc:   "a one property keyframe sequence with some null offsets",
-    input:  [{ offset: 0.00, left: "10px" },
-             { offset: 0.25, left: "20px" },
-             { offset: null, left: "30px" },
-             { offset: null, left: "40px" },
-             { offset: 1.00, left: "50px" }],
-    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
-               left: "10px" },
-             { offset: 0.25, computedOffset: 0.25, easing: "linear",
-               left: "20px" },
-             { offset: null, computedOffset: 0.50, easing: "linear",
-               left: "30px" },
-             { offset: null, computedOffset: 0.75, easing: "linear",
-               left: "40px" },
-             { offset: 1.00, computedOffset: 1.00, easing: "linear",
-               left: "50px" }] },
-  { desc:   "a two property keyframe sequence with some omitted offsets",
-    input:  [{ offset: 0.00, left: "10px", top: "20px" },
-             { offset: 0.25, left: "30px" },
-             { left: "40px" },
-             { left: "50px", top: "60px" },
-             { offset: 1.00, left: "70px", top: "80px" }],
-    output: [{ offset: 0.00, computedOffset: 0.00, easing: "linear",
-               left: "10px", top: "20px" },
-             { offset: 0.25, computedOffset: 0.25, easing: "linear",
-               left: "30px" },
-             { offset: null, computedOffset: 0.50, easing: "linear",
-               left: "40px" },
-             { offset: null, computedOffset: 0.75, easing: "linear",
-               left: "50px", top: "60px" },
-             { offset: 1.00, computedOffset: 1.00, easing: "linear",
-               left: "70px", top: "80px" }] },
-  { desc:   "a one property keyframe sequence with all omitted offsets",
-    input:  [{ left: "10px" },
-             { left: "20px" },
-             { left: "30px" },
-             { left: "40px" },
-             { left: "50px" }],
-    output: [{ offset: null, computedOffset: 0.00, easing: "linear",
-               left: "10px" },
-             { offset: null, computedOffset: 0.25, easing: "linear",
-               left: "20px" },
-             { offset: null, computedOffset: 0.50, easing: "linear",
-               left: "30px" },
-             { offset: null, computedOffset: 0.75, easing: "linear",
-               left: "40px" },
-             { offset: null, computedOffset: 1.00, easing: "linear",
-               left: "50px" }] },
-  { desc:   "a keyframe sequence with different easing values, but the same"
-            + " easing value for a given offset",
-    input:  [{ offset: 0.0, easing: "ease",     left: "10px"},
-             { offset: 0.0, easing: "ease",     top: "20px"},
-             { offset: 0.5, easing: "linear",   left: "30px" },
-             { offset: 0.5, easing: "linear",   top: "40px" },
-             { offset: 1.0, easing: "step-end", left: "50px" },
-             { offset: 1.0, easing: "step-end", top: "60px" }],
-    output: [{ offset: 0.0, computedOffset: 0.0, easing: "ease",
-               left: "10px" },
-             { offset: 0.0, computedOffset: 0.0, easing: "ease",
-               top: "20px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "30px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               top: "40px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
-               left: "50px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
-               top: "60px" }] },
-  { desc:   "a keyframe sequence with different composite values, but the"
-            + " same composite value for a given offset",
-    input:  [{ offset: 0.0, composite: "replace", left: "10px" },
-             { offset: 0.0, composite: "replace", top: "20px" },
-             { offset: 0.5, composite: "add",     left: "30px" },
-             { offset: 0.5, composite: "add",     top: "40px" },
-             { offset: 1.0, composite: "replace", left: "50px" },
-             { offset: 1.0, composite: "replace", top: "60px" }],
-    output: [{ offset: 0.0, computedOffset: 0.0, easing: "linear",
-               composite: "replace", left: "10px" },
-             { offset: 0.0, computedOffset: 0.0, easing: "linear",
-               composite: "replace", top: "20px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               composite: "add", left: "30px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               composite: "add", top: "40px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "linear",
-               composite: "replace", left: "50px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "linear",
-               composite: "replace", top: "60px" }] },
-  { desc:   "a one property two keyframe sequence that needs to stringify"
-            + " its values",
-    input:  [{ offset: 0, opacity: 0 },
-             { offset: 1, opacity: 1 }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear", opacity: "0" },
-             { offset: 1, computedOffset: 1, easing: "linear", opacity: "1" }]
-  },
-  { desc:   "a keyframe sequence with a CSS variable reference",
-    input:  [{ left: "var(--dist)" },
-             { left: "calc(var(--dist) + 100px)" }],
-    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
-               left: "var(--dist)" },
-             { offset: null, computedOffset: 1.0, easing: "linear",
-               left: "calc(var(--dist) + 100px)" }] },
-  { desc:   "a keyframe sequence with a CSS variable reference in a shorthand"
-            + " property",
-    input:  [{ margin: "var(--dist)" },
-             { margin: "calc(var(--dist) + 100px)" }],
-    output: [{ offset: null, computedOffset: 0.0, easing: "linear",
-               margin: "var(--dist)" },
-             { offset: null, computedOffset: 1.0, easing: "linear",
-               margin: "calc(var(--dist) + 100px)" }] },
-  { desc:   "a keyframe sequence where shorthand precedes longhand",
-    input:  [{ offset: 0, margin: "10px", marginRight: "20px" },
-             { offset: 1, margin: "30px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               margin: "10px", marginRight: "20px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               margin: "30px" }] },
-  { desc:   "a keyframe sequence where longhand precedes shorthand",
-    input:  [{ offset: 0, marginRight: "20px", margin: "10px" },
-             { offset: 1, margin: "30px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               marginRight: "20px", margin: "10px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               margin: "30px" }] },
-  { desc:   "a keyframe sequence where lesser shorthand precedes greater"
-            + " shorthand",
-    input:  [{ offset: 0,
-               borderLeft: "1px solid rgb(1, 2, 3)",
-               border: "2px dotted rgb(4, 5, 6)" },
-             { offset: 1, border: "3px dashed rgb(7, 8, 9)" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               borderLeft: "1px solid rgb(1, 2, 3)",
-               border: "2px dotted rgb(4, 5, 6)" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               border: "3px dashed rgb(7, 8, 9)" }] },
-  { desc:   "a keyframe sequence where greater shorthand precedes lesser"
-            + " shorthand",
-    input:  [{ offset: 0, border: "2px dotted rgb(4, 5, 6)",
-               borderLeft: "1px solid rgb(1, 2, 3)" },
-             { offset: 1, border: "3px dashed rgb(7, 8, 9)" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               border: "2px dotted rgb(4, 5, 6)",
-               borderLeft: "1px solid rgb(1, 2, 3)" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               border: "3px dashed rgb(7, 8, 9)" }] },
-  { desc:   "a two property keyframe sequence where one property is missing"
-            + " from the first keyframe",
-    input:  [{ offset: 0, left: "10px" },
-             { offset: 1, left: "20px", top: "30px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear", left: "10px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               left: "20px", top: "30px" }] },
-  { desc:   "a two property keyframe sequence where one property is missing"
-            + " from the last keyframe",
-    input:  [{ offset: 0, left: "10px", top: "20px" },
-             { offset: 1, left: "30px" }],
-    output: [{ offset: 0, computedOffset: 0, easing: "linear",
-               left: "10px" , top: "20px" },
-             { offset: 1, computedOffset: 1, easing: "linear",
-               left: "30px" }] },
-  { desc:   "a keyframe sequence with repeated values at offset 1 with"
-            + " different easings",
-    input:  [{ offset: 0.0, left: "100px", easing: "ease" },
-             { offset: 0.0, left: "200px", easing: "ease" },
-             { offset: 0.5, left: "300px", easing: "linear" },
-             { offset: 1.0, left: "400px", easing: "ease-out" },
-             { offset: 1.0, left: "500px", easing: "step-end" }],
-    output: [{ offset: 0.0, computedOffset: 0.0, easing: "ease",
-               left: "100px" },
-             { offset: 0.0, computedOffset: 0.0, easing: "ease",
-               left: "200px" },
-             { offset: 0.5, computedOffset: 0.5, easing: "linear",
-               left: "300px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "ease-out",
-               left: "400px" },
-             { offset: 1.0, computedOffset: 1.0, easing: "steps(1)",
-               left: "500px" }] },
-];
-
-var gInvalidKeyframesTests = [
-  { desc:     "keyframes with an out-of-bounded positive offset",
-    input:    [ { opacity: 0 },
-                { opacity: 0.5, offset: 2 },
-                { opacity: 1 } ],
-    expected: { name: "TypeError" } },
-  { desc:     "keyframes with an out-of-bounded negative offset",
-    input:    [ { opacity: 0 },
-                { opacity: 0.5, offset: -1 },
-                { opacity: 1 } ],
-    expected: { name: "TypeError" } },
-  { desc:     "keyframes not loosely sorted by offset",
-    input:    [ { opacity: 0, offset: 1 },
-                { opacity: 1, offset: 0 } ],
-    expected: { name: "TypeError" } },
-  { desc:     "property-indexed keyframes with an invalid easing value",
-    input:    { opacity: [ 0, 0.5, 1 ],
-                easing: "inherit" },
-    expected: { name: "TypeError" } },
-  { desc:     "a keyframe sequence with an invalid easing value",
-    input:    [ { opacity: 0, easing: "jumpy" },
-                { opacity: 1 } ],
-    expected: { name: "TypeError" } },
-  { desc:     "keyframes with an invalid composite value",
-    input:    [ { opacity: 0, composite: "alternate" },
-                { opacity: 1 } ],
-    expected: { name: "TypeError" } }
-];
-
-// ------------------------------
-//  KeyframeEffectOptions
-// ------------------------------
-
-var gKeyframeEffectOptionTests = [
-  { desc:     "an empty KeyframeEffectOptions object",
-    input:    { },
-    expected: { } },
-  { desc:     "a normal KeyframeEffectOptions object",
-    input:    { delay: 1000,
-                fill: "auto",
-                iterations: 5.5,
-                duration: "auto",
-                direction: "alternate" },
-    expected: { delay: 1000,
-                fill: "auto",
-                iterations: 5.5,
-                duration: "auto",
-                direction: "alternate" } },
-  { desc:     "a double value",
-    input:    3000,
-    expected: { duration: 3000 } },
-  { desc:     "+Infinity",
-    input:    Infinity,
-    expected: { duration: Infinity } },
-  { desc:     "an Infinity duration",
-    input:    { duration: Infinity },
-    expected: { duration: Infinity } },
-  { desc:     "an auto duration",
-    input:    { duration: "auto" },
-    expected: { duration: "auto" } },
-  { desc:     "an Infinity iterations",
-    input:    { iterations: Infinity },
-    expected: { iterations: Infinity } },
-  { desc:     "an auto fill",
-    input:    { fill: "auto" },
-    expected: { fill: "auto" } },
-  { desc:     "a forwards fill",
-    input:    { fill: "forwards" },
-    expected: { fill: "forwards" } }
-];
-
-var gInvalidKeyframeEffectOptionTests = [
-  { desc:     "-Infinity",
-    input:    -Infinity,
-    expected: { name: "TypeError" } },
-  { desc:     "NaN",
-    input:    NaN,
-    expected: { name: "TypeError" } },
-  { desc:     "a negative value",
-    input:    -1,
-    expected: { name: "TypeError" } },
-  { desc:     "a negative Infinity duration",
-    input:    { duration: -Infinity },
-    expected: { name: "TypeError" } },
-  { desc:     "a NaN duration",
-    input:    { duration: NaN },
-    expected: { name: "TypeError" } },
-  { desc:     "a negative duration",
-    input:    { duration: -1 },
-    expected: { name: "TypeError" } },
-  { desc:     "a string duration",
-    input:    { duration: "merrychristmas" },
-    expected: { name: "TypeError" } },
-  { desc:     "a negative Infinity iterations",
-    input:    { iterations: -Infinity},
-    expected: { name: "TypeError" } },
-  { desc:     "a NaN iterations",
-    input:    { iterations: NaN },
-    expected: { name: "TypeError" } },
-  { desc:     "a negative iterations",
-    input:    { iterations: -1 },
-    expected: { name: "TypeError" } },
-  { desc:     "a blank easing",
-    input:    { easing: "" },
-    expected: { name: "TypeError" } },
-  { desc:     "an unrecognized easing",
-    input:    { easing: "unrecognised" },
-    expected: { name: "TypeError" } },
-  { desc:     "an 'initial' easing",
-    input:    { easing: "initial" },
-    expected: { name: "TypeError" } },
-  { desc:     "an 'inherit' easing",
-    input:    { easing: "inherit" },
-    expected: { name: "TypeError" } },
-  { desc:     "a variable easing",
-    input:    { easing: "var(--x)" },
-    expected: { name: "TypeError" } },
-  { desc:     "a multi-value easing",
-    input:    { easing: "ease-in-out, ease-out" },
-    expected: { name: "TypeError" } }
-];