Added support of calc() for SVGLength

third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp

 // 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.
 
 #include "core/animation/SVGLengthInterpolationType.h"
 
 #include "core/animation/InterpolationEnvironment.h"
 #include "core/animation/StringKeyframe.h"
 #include "core/css/CSSHelper.h"
 #include "core/svg/SVGElement.h"
@@ skipping 85 matching lines @@
 {
     std::unique_ptr<InterpolableList> listOfValues = InterpolableList::create(numLengthInterpolatedUnits);
     for (size_t i = 0; i < numLengthInterpolatedUnits; ++i)
         listOfValues->set(i, InterpolableNumber::create(0));
 
     return std::move(listOfValues);
 }
 
 InterpolationValue SVGLengthInterpolationType::convertSVGLength(const SVGLength& length)
 {
-    double value = length.valueInSpecifiedUnits();
-    LengthInterpolatedUnit unitType = convertToInterpolatedUnit(length.typeWithCalcResolved(), value);
+    const CSSPrimitiveValue* primitiveValue = length.asCSSPrimitiveValue();
+
+    CSSLengthArray lengthArray;
+    primitiveValue->accumulateLengthArray(lengthArray);
 
     double values[numLengthInterpolatedUnits] = { };
-    values[unitType] = value;
+
+    for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
+        double value = lengthArray.values[i];
+        LengthInterpolatedUnit unitType = convertToInterpolatedUnit(SVGLength::toUnitType(i), value);

[fs, 2016/07/16 21:13:02]

Couldn't we take this opportunity to transition to LengthUnitType from
CSSPrimitiveValue? (And potentially gain 'ch' support as well?) Then I think
this loop would fold with the loop below, and all the remapping code would go
away.

[Shanmuga Pandi, 2016/07/18 13:35:32]

That's good thought.. :)
Done!!

[fs, 2016/07/18 13:56:48]

Looks great, thanks!

+        values[unitType] = value;
+    }
 
     std::unique_ptr<InterpolableList> listOfValues = InterpolableList::create(numLengthInterpolatedUnits);
     for (size_t i = 0; i < numLengthInterpolatedUnits; ++i)
         listOfValues->set(i, InterpolableNumber::create(values[i]));
 
     return InterpolationValue(std::move(listOfValues));
 }
 
 SVGLength* SVGLengthInterpolationType::resolveInterpolableSVGLength(const InterpolableValue& interpolableValue, const SVGLengthContext& lengthContext, SVGLengthMode unitMode, bool negativeValuesForbidden)
 {
@@ skipping 56 matching lines @@
 }
 
 void SVGLengthInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const
 {
     SVGElement& element = environment.svgElement();
     SVGLengthContext lengthContext(&element);
     element.setWebAnimatedAttribute(attribute(), resolveInterpolableSVGLength(interpolableValue, lengthContext, m_unitMode, m_negativeValuesForbidden));
 }
 
 } // namespace blink