Make neutral keyframes explicit in SVG attribute interpolation test API

This patch changes the way neutral keyframes are specified in
SVG attribute interpolation tests to be more explicit using an exported
neutralKeyframe object.

BUG=530436

Review URL: https://codereview.chromium.org/1459093002

Cr-Commit-Position: refs/heads/master@{#361063}

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-amplitude-composition.html

@@ -46,6 +46,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'amplitude',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-azimuth-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'azimuth',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-bias-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'bias',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-diffuseConstant-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'diffuseConstant',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-divisor-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'divisor',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-elevation-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'elevation',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-exponent-composition.html

@@ -46,6 +46,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'exponent',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-intercept-composition.html

@@ -46,6 +46,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'intercept',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-k1-k2-k3-k4-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'k1',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [
@@ -90,6 +91,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'k2',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [
@@ -136,6 +138,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'k3',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [
@@ -182,6 +185,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'k4',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-limitingConeAngle-composition.html

@@ -48,6 +48,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'limitingConeAngle',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-mode-composition.html

@@ -28,6 +28,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'mode',
   underlying: 'multiply'
+  from: neutralKeyframe,
   to: 'lighten',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-numOctaves-composition.html

@@ -60,6 +60,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'numOctaves',
   underlying: '2',
+  from: neutralKeyframe,
   to: '7',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-offset-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'offset',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-orient-composition.html

@@ -59,6 +59,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'orient',
   underlying: '20',
+  from: neutralKeyframe,
   to: '180',
   toComposite: 'replace'
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-pathLength-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'pathLength',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-points-composition.html

@@ -108,6 +108,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'points',
   underlying: '10 10, 20 20',
+  from: neutralKeyframe,
   to: '90 90, -10 -10',
   toComposite: 'replace',
 }, [
@@ -122,6 +123,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'points',
   underlying: '10 10, 20 20',
+  from: neutralKeyframe,
   to: '90 90, -10 -10, 50 50',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-pointsAtX-pointsAtY-pointsAtZ-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'pointsAtX',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [
@@ -90,6 +91,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'pointsAtY',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [
@@ -136,6 +138,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'pointsAtZ',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-scale-composition.html

@@ -48,6 +48,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'scale',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-seed-composition.html

@@ -48,6 +48,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'seed',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-slope-composition.html

@@ -46,6 +46,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'slope',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-specularConstant-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'specularConstant',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-specularExponent-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'specularExponent',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-surfaceScale-composition.html

@@ -44,6 +44,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'surfaceScale',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-composition/svg-z-composition.html

@@ -48,6 +48,7 @@ assertAttributeInterpolation({
 assertAttributeInterpolation({
   property: 'z',
   underlying: '5',
+  from: neutralKeyframe,
   to: '10',
   toComposite: 'replace',
 }, [

third_party/WebKit/LayoutTests/animations/svg-attribute-interpolation/resources/interpolation-test.js

@@ -3,22 +3,26 @@
  * found in the LICENSE file.
  *
  * Exported function:
- *  - assertAttributeInterpolation({property, [from], [to], [fromComposite], [toComposite], [underlying]}, [{at: fraction, is: value}])
+ *  - assertAttributeInterpolation({property, from, to, [fromComposite], [toComposite], [underlying]}, [{at: fraction, is: value}])
  *        Constructs a test case for each fraction that asserts the expected value
  *        equals the value produced by interpolation between from and to composited
  *        onto underlying by fromComposite and toComposite respectively using
  *        SMIL and Web Animations.
- *        If from or to are missing then a neutral keyframe will be used and the
- *        composite mode will be forced to be 'add'.
+ *        Set from/to to the exported neutralKeyframe object to specify neutral keyframes.
  *        SMIL will only be tested with equal fromComposite and toComposite values.
 */
 'use strict';
 (() => {
   var interpolationTests = [];
+  var neutralKeyframe = {};
 
   // Set to true to output rebaselined test expectations.
   var rebaselineTests = false;
 
+  function isNeutralKeyframe(keyframe) {
+    return keyframe === neutralKeyframe;
+  }
+
   function createElement(tagName, container) {
     var element = document.createElement(tagName);
     if (container) {
@@ -320,23 +324,19 @@
         // Replace 'transform' with 'svgTransform', etc. This avoids collisions with CSS properties or the Web Animations API (offset).
         var prefixedProperty = 'svg' + params.property[0].toUpperCase() + params.property.slice(1);
         var keyframes = [];
-        if ('from' in params) {
+        if (!isNeutralKeyframe(params.from)) {
           keyframes.push({
             offset: 0,
             [prefixedProperty]: params.from,
             composite: params.fromComposite,
           });
-        } else {
-          console.assert(params.fromComposite === 'add');
         }
-        if ('to' in params) {
+        if (!isNeutralKeyframe(params.to)) {
           keyframes.push({
             offset: 1,
             [prefixedProperty]: params.to,
             composite: params.toComposite,
           });
-        } else {
-          console.assert(params.toComposite === 'add');
         }
         target.animate(keyframes, {
           fill: 'forwards',
@@ -372,29 +372,44 @@
     var targets = [];
     for (var interpolationTest of interpolationTests) {
       var params = interpolationTest.params;
-      params.fromComposite = 'from' in params ? (params.fromComposite || 'replace') : 'add';
-      params.toComposite = 'to' in params ? (params.toComposite || 'replace') : 'add';
+      assert_true('property' in params);
+      assert_true('from' in params);
+      assert_true('to' in params);
+      params.fromComposite = isNeutralKeyframe(params.from) ? 'add' : (params.fromComposite || 'replace');
+      params.toComposite = isNeutralKeyframe(params.to) ? 'add' : (params.toComposite || 'replace');
       var underlyingText = params.underlying ? `with underlying [${params.underlying}] ` : '';
-      var fromText = 'from' in params ? `${params.fromComposite} [${params.from}]` : 'neutral';
-      var toText = 'to' in params ? `${params.toComposite} [${params.to}]` : 'neutral';
+      var fromText = isNeutralKeyframe(params.from) ? 'neutral' : `${params.fromComposite} [${params.from}]`;
+      var toText = isNeutralKeyframe(params.to) ? 'neutral' : `${params.toComposite} [${params.to}]`;
       var description = `Interpolate attribute <${params.property}> ${underlyingText}from ${fromText} to ${toText}`;
 
     if (rebaselineTests) {
         var rebaseline = createElement('pre', rebaselineContainer);
 
-        var fromCode = 'from' in params ? `
-  from: '${params.from}',
-  fromComposite: '${params.fromComposite}',` : '';
+        var assertionCode =
+          `assertAttributeInterpolation({\n` +
+          `  property: '${params.property}',\n` +
+          `  underlying: '${params.underlying}',\n`;
+
+
+        if (isNeutralKeyframe(params.from)) {
+          assertionCode += `  from: neutralKeyframe,\n`;
+        } else {
+          assertionCode +=
+            `  from: '${params.from}',\n` +
+            `  fromComposite: '${params.fromComposite}',\n`;
+        }
+
+        if (isNeutralKeyframe(params.to)) {
+          assertionCode += `  to: neutralKeyframe,\n`;
+        } else {
+          assertionCode +=
+            `  to: '${params.to}',\n` +
+            `  fromComposite: '${params.fromComposite}',\n`;
+        }
 
-        var toCode = 'to' in params ? `
-  to: '${params.to}',
-  toComposite: '${params.toComposite}',` : '';
+        assertionCode += `\n}, [\n`;
 
-        rebaseline.appendChild(document.createTextNode(`\
-assertAttributeInterpolation({
-  property: '${params.property}',
-  underlying: '${params.underlying}',${fromCode}${toCode}
-}, [\n`));
+        rebaseline.appendChild(document.createTextNode(assertionCode));
         var rebaselineExpectation;
         rebaseline.appendChild(rebaselineExpectation = document.createTextNode(''));
         rebaseline.appendChild(document.createTextNode(']);\n\n'));
@@ -461,4 +476,5 @@ assertAttributeInterpolation({
   });
 
   window.assertAttributeInterpolation = assertAttributeInterpolation;
+  window.neutralKeyframe = neutralKeyframe;
 })();