Web Animations: Add SVGIntegerOptionalIntegerInterpolationType

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

 /* Copyright 2015 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Exported function:
  *  - 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.
@@ skipping 350 matching lines @@
 
         assert_equals(
           normalizeValue(actualResult),
           normalizeValue(getAttributeValue(expected, params.property)));
       }, `${method}: ${description} at (${expectation.at}) is [${expectation.is}]`);
     };
 
     return target;
   }
 
+  function reprKeyframe(x) {

[dstockwell, 2015/11/23 04:51:43]

this isn't python. repr is a bit weird.

[alancutter (OOO until 2018), 2015/11/23 06:10:36]

This change is out of date with other landed patches to this file, removed after
rebasing.

+    return (typeof x === 'string') ? "'" + x + "'" : null;
+  }
+
   function createTestTargets(interpolationTests, container, rebaselineContainer) {
     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';
       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 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 toCode = 'to' in params ? `
-  to: '${params.to}',
-  toComposite: '${params.toComposite}',` : '';
-
         rebaseline.appendChild(document.createTextNode(`\
 assertAttributeInterpolation({
   property: '${params.property}',
-  underlying: '${params.underlying}',${fromCode}${toCode}
+  underlying: '${params.underlying}',
+  from: ${reprKeyframe(params.from)},
+  fromComposite: '${params.fromComposite}',
+  to: ${reprKeyframe(params.to)},
+  toComposite: '${params.toComposite}',
 }, [\n`));
         var rebaselineExpectation;
         rebaseline.appendChild(rebaselineExpectation = document.createTextNode(''));
         rebaseline.appendChild(document.createTextNode(']);\n\n'));
       }
 
       for (var method of ['SMIL', 'Web Animations']) {
         if (method === 'SMIL' && params.fromComposite !== params.toComposite) {
           continue;
         }
@@ skipping 48 matching lines @@
     return loadScript('../../resources/testharnessreport.js');
   }).then(() => {
     var asyncHandle = async_test('This test uses interpolation-test.js.')
     requestAnimationFrame(() => {
       runTests().then(() => asyncHandle.done());
     });
   });
 
   window.assertAttributeInterpolation = assertAttributeInterpolation;
 })();