Refactor SVGAnimatedLength negative values mode

third_party/WebKit/Source/core/animation/LengthSVGInterpolation.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 "config.h"
 #include "core/animation/LengthSVGInterpolation.h"
 
 #include "core/css/CSSHelper.h"
 #include "core/svg/SVGAnimatedLength.h"
 #include "core/svg/SVGAnimatedLengthList.h"
@@ skipping 19 matching lines @@
 }
 
 namespace {
 
 void populateModeData(const SVGAnimatedPropertyBase* attribute, LengthSVGInterpolation::NonInterpolableType* ptrModeData)
 {
     switch (attribute->type()) {
     case AnimatedLength: {
         const SVGAnimatedLength& animatedLength = static_cast<const SVGAnimatedLength&>(*attribute);
         ptrModeData->unitMode = animatedLength.currentValue()->unitMode();
-        ptrModeData->negativeValuesMode = animatedLength.negativeValuesMode();
         break;
     }
     case AnimatedLengthList: {
         const SVGAnimatedLengthList& animatedLengthList = static_cast<const SVGAnimatedLengthList&>(*attribute);
         ptrModeData->unitMode = animatedLengthList.currentValue()->unitMode();
-        ptrModeData->negativeValuesMode = AllowNegativeLengths;
         break;
     }
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 enum LengthInterpolatedUnit {
     LengthInterpolatedNumber,
     LengthInterpolatedPercentage,
@@ skipping 65 matching lines @@
 
     double values[numLengthInterpolatedUnits] = { };
     values[unitType] = value;
 
     OwnPtr<InterpolableList> listOfValues = InterpolableList::create(numLengthInterpolatedUnits);
     for (size_t i = 0; i < numLengthInterpolatedUnits; ++i)
         listOfValues->set(i, InterpolableNumber::create(values[i]));
     return listOfValues.release();
 }
 
-PassRefPtrWillBeRawPtr<SVGLength> LengthSVGInterpolation::fromInterpolableValue(const InterpolableValue& interpolableValue, const NonInterpolableType& modeData, const SVGElement* element)
+PassRefPtrWillBeRawPtr<SVGLength> LengthSVGInterpolation::fromInterpolableValue(const InterpolableValue& interpolableValue, const NonInterpolableType& modeData, const SVGElement* element, const QualifiedName& attributeName)
 {
     const InterpolableList& listOfValues = toInterpolableList(interpolableValue);
     ASSERT(element);
 
     double value = 0;
     CSSPrimitiveValue::UnitType unitType = CSSPrimitiveValue::UnitType::UserUnits;
     unsigned unitTypeCount = 0;
     // We optimise for the common case where only one unit type is involved.
     for (size_t i = 0; i < numLengthInterpolatedUnits; i++) {
         double entry = toInterpolableNumber(listOfValues.get(i))->value();
@@ skipping 13 matching lines @@
 
         // SVGLength does not support calc expressions, so we convert to canonical units.
         SVGLengthContext lengthContext(element);
         for (size_t i = 0; i < numLengthInterpolatedUnits; i++) {
             double entry = toInterpolableNumber(listOfValues.get(i))->value();
             if (entry)
                 value += lengthContext.convertValueToUserUnits(entry, modeData.unitMode, unitTypes[i]);
         }
     }
 
-    if (modeData.negativeValuesMode == ForbidNegativeLengths && value < 0)
+    if (SVGLength::negativeValuesModeForAnimatedLengthAttribute(attributeName) == ForbidNegativeLengths && value < 0)
         value = 0;
 
     RefPtrWillBeRawPtr<SVGLength> result = SVGLength::create(modeData.unitMode); // defaults to the length 0
     result->newValueSpecifiedUnits(unitType, value);
     return result.release();
 }
 
 PassRefPtrWillBeRawPtr<SVGPropertyBase> LengthSVGInterpolation::interpolatedValue(SVGElement& targetElement) const
 {
-    return fromInterpolableValue(*m_cachedValue, m_modeData, &targetElement);
+    return fromInterpolableValue(*m_cachedValue, m_modeData, &targetElement, attributeName());
 }
 
 }