Move static methods out of CSSLengthInterpolationType to LengthInterpolationFunctions

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

 // Copyright 2016 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/BasicShapeInterpolationFunctions.h"
 
-#include "core/animation/CSSLengthInterpolationType.h"
 #include "core/animation/CSSPositionAxisListInterpolationType.h"
+#include "core/animation/LengthInterpolationFunctions.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/BasicShapes.h"
 #include <memory>
 
 namespace blink {
 
 class BasicShapeNonInterpolableValue : public NonInterpolableValue {
 public:
     static PassRefPtr<NonInterpolableValue> create(BasicShape::ShapeType type)
@@ skipping 57 matching lines @@
 std::unique_ptr<InterpolableValue> unwrap(InterpolationValue&& value)
 {
     DCHECK(value.interpolableValue);
     return std::move(value.interpolableValue);
 }
 
 std::unique_ptr<InterpolableValue> convertCSSCoordinate(const CSSValue* coordinate)
 {
     if (coordinate)
         return unwrap(CSSPositionAxisListInterpolationType::convertPositionAxisCSSValue(*coordinate));
-    return unwrap(CSSLengthInterpolationType::maybeConvertLength(Length(50, Percent), 1));
+    return unwrap(LengthInterpolationFunctions::maybeConvertLength(Length(50, Percent), 1));
 }
 
 std::unique_ptr<InterpolableValue> convertCoordinate(const BasicShapeCenterCoordinate& coordinate, double zoom)
 {
-    return unwrap(CSSLengthInterpolationType::maybeConvertLength(coordinate.computedLength(), zoom));
+    return unwrap(LengthInterpolationFunctions::maybeConvertLength(coordinate.computedLength(), zoom));
 }
 
 std::unique_ptr<InterpolableValue> createNeutralInterpolableCoordinate()
 {
-    return CSSLengthInterpolationType::createNeutralInterpolableValue();
+    return LengthInterpolationFunctions::createNeutralInterpolableValue();
 }
 
 BasicShapeCenterCoordinate createCoordinate(const InterpolableValue& interpolableValue, const CSSToLengthConversionData& conversionData)
 {
     return BasicShapeCenterCoordinate(
         BasicShapeCenterCoordinate::TopLeft,
-        CSSLengthInterpolationType::createLength(interpolableValue, nullptr, conversionData));
+        LengthInterpolationFunctions::createLength(interpolableValue, nullptr, conversionData, ValueRangeAll));
 }
 
 std::unique_ptr<InterpolableValue> convertCSSRadius(const CSSPrimitiveValue* radius)
 {
     if (!radius || radius->isValueID())
         return nullptr;
-    return unwrap(CSSLengthInterpolationType::maybeConvertCSSValue(*radius));
+    return unwrap(LengthInterpolationFunctions::maybeConvertCSSValue(*radius));
 }
 
 std::unique_ptr<InterpolableValue> convertRadius(const BasicShapeRadius& radius, double zoom)
 {
     if (radius.type() != BasicShapeRadius::Value)
         return nullptr;
-    return unwrap(CSSLengthInterpolationType::maybeConvertLength(radius.value(), zoom));
+    return unwrap(LengthInterpolationFunctions::maybeConvertLength(radius.value(), zoom));
 }
 
 std::unique_ptr<InterpolableValue> createNeutralInterpolableRadius()
 {
-    return CSSLengthInterpolationType::createNeutralInterpolableValue();
+    return LengthInterpolationFunctions::createNeutralInterpolableValue();
 }
 
 BasicShapeRadius createRadius(const InterpolableValue& interpolableValue, const CSSToLengthConversionData& conversionData)
 {
-    return BasicShapeRadius(CSSLengthInterpolationType::createLength(interpolableValue, nullptr, conversionData, ValueRangeNonNegative));
+    return BasicShapeRadius(LengthInterpolationFunctions::createLength(interpolableValue, nullptr, conversionData, ValueRangeNonNegative));
 }
 
 std::unique_ptr<InterpolableValue> convertCSSLength(const CSSValue* length)
 {
     if (!length)
-        return CSSLengthInterpolationType::createNeutralInterpolableValue();
-    return unwrap(CSSLengthInterpolationType::maybeConvertCSSValue(*length));
+        return LengthInterpolationFunctions::createNeutralInterpolableValue();
+    return unwrap(LengthInterpolationFunctions::maybeConvertCSSValue(*length));
 }
 
 std::unique_ptr<InterpolableValue> convertLength(const Length& length, double zoom)
 {
-    return unwrap(CSSLengthInterpolationType::maybeConvertLength(length, zoom));
+    return unwrap(LengthInterpolationFunctions::maybeConvertLength(length, zoom));
 }
 
 std::unique_ptr<InterpolableValue> convertCSSBorderRadiusWidth(const CSSValuePair* pair)
 {
     return convertCSSLength(pair ? &pair->first() : nullptr);
 }
 
 std::unique_ptr<InterpolableValue> convertCSSBorderRadiusHeight(const CSSValuePair* pair)
 {
     return convertCSSLength(pair ? &pair->second() : nullptr);
 }
 
 LengthSize createBorderRadius(const InterpolableValue& width, const InterpolableValue& height, const CSSToLengthConversionData& conversionData)
 {
     return LengthSize(
-        CSSLengthInterpolationType::createLength(width, nullptr, conversionData, ValueRangeNonNegative),
-        CSSLengthInterpolationType::createLength(height, nullptr, conversionData, ValueRangeNonNegative));
+        LengthInterpolationFunctions::createLength(width, nullptr, conversionData, ValueRangeNonNegative),
+        LengthInterpolationFunctions::createLength(height, nullptr, conversionData, ValueRangeNonNegative));
 }
 
 namespace CircleFunctions {
 
 enum CircleComponentIndex : unsigned {
     CircleCenterXIndex,
     CircleCenterYIndex,
     CircleRadiusIndex,
     CircleComponentIndexCount,
 };
@@ skipping 166 matching lines @@
     list->set(InsetBorderBottomRightWidthIndex, convertLength(inset.bottomRightRadius().width(), zoom));
     list->set(InsetBorderBottomRightHeightIndex, convertLength(inset.bottomRightRadius().height(), zoom));
     list->set(InsetBorderBottomLeftWidthIndex, convertLength(inset.bottomLeftRadius().width(), zoom));
     list->set(InsetBorderBottomLeftHeightIndex, convertLength(inset.bottomLeftRadius().height(), zoom));
     return InterpolationValue(std::move(list), BasicShapeNonInterpolableValue::create(BasicShape::BasicShapeInsetType));
 }
 
 std::unique_ptr<InterpolableValue> createNeutralValue()
 {
     std::unique_ptr<InterpolableList> list = InterpolableList::create(InsetComponentIndexCount);
-    list->set(InsetTopIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetRightIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBottomIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetLeftIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
+    list->set(InsetTopIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetRightIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBottomIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetLeftIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
 
-    list->set(InsetBorderTopLeftWidthIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderTopLeftHeightIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderTopRightWidthIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderTopRightHeightIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderBottomRightWidthIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderBottomRightHeightIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderBottomLeftWidthIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
-    list->set(InsetBorderBottomLeftHeightIndex, CSSLengthInterpolationType::createNeutralInterpolableValue());
+    list->set(InsetBorderTopLeftWidthIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderTopLeftHeightIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderTopRightWidthIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderTopRightHeightIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderBottomRightWidthIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderBottomRightHeightIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderBottomLeftWidthIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
+    list->set(InsetBorderBottomLeftHeightIndex, LengthInterpolationFunctions::createNeutralInterpolableValue());
     return std::move(list);
 }
 
 PassRefPtr<BasicShape> createBasicShape(const InterpolableValue& interpolableValue, const CSSToLengthConversionData& conversionData)
 {
     RefPtr<BasicShapeInset> inset = BasicShapeInset::create();
     const InterpolableList& list = toInterpolableList(interpolableValue);
-    inset->setTop(CSSLengthInterpolationType::createLength(*list.get(InsetTopIndex), nullptr, conversionData));
-    inset->setRight(CSSLengthInterpolationType::createLength(*list.get(InsetRightIndex), nullptr, conversionData));
-    inset->setBottom(CSSLengthInterpolationType::createLength(*list.get(InsetBottomIndex), nullptr, conversionData));
-    inset->setLeft(CSSLengthInterpolationType::createLength(*list.get(InsetLeftIndex), nullptr, conversionData));
+    inset->setTop(LengthInterpolationFunctions::createLength(*list.get(InsetTopIndex), nullptr, conversionData, ValueRangeAll));
+    inset->setRight(LengthInterpolationFunctions::createLength(*list.get(InsetRightIndex), nullptr, conversionData, ValueRangeAll));
+    inset->setBottom(LengthInterpolationFunctions::createLength(*list.get(InsetBottomIndex), nullptr, conversionData, ValueRangeAll));
+    inset->setLeft(LengthInterpolationFunctions::createLength(*list.get(InsetLeftIndex), nullptr, conversionData, ValueRangeAll));
 
     inset->setTopLeftRadius(createBorderRadius(*list.get(InsetBorderTopLeftWidthIndex), *list.get(InsetBorderTopLeftHeightIndex), conversionData));
     inset->setTopRightRadius(createBorderRadius(*list.get(InsetBorderTopRightWidthIndex), *list.get(InsetBorderTopRightHeightIndex), conversionData));
     inset->setBottomRightRadius(createBorderRadius(*list.get(InsetBorderBottomRightWidthIndex), *list.get(InsetBorderBottomRightHeightIndex), conversionData));
     inset->setBottomLeftRadius(createBorderRadius(*list.get(InsetBorderBottomLeftWidthIndex), *list.get(InsetBorderBottomLeftHeightIndex), conversionData));
     return inset.release();
 }
 
 } // namespace InsetFunctions
 
@@ skipping 14 matching lines @@
     std::unique_ptr<InterpolableList> list = InterpolableList::create(size);
     for (size_t i = 0; i < size; i++)
         list->set(i, convertLength(polygon.values()[i], zoom));
     return InterpolationValue(std::move(list), BasicShapeNonInterpolableValue::createPolygon(polygon.getWindRule(), size));
 }
 
 std::unique_ptr<InterpolableValue> createNeutralValue(const BasicShapeNonInterpolableValue& nonInterpolableValue)
 {
     std::unique_ptr<InterpolableList> list = InterpolableList::create(nonInterpolableValue.size());
     for (size_t i = 0; i < nonInterpolableValue.size(); i++)
-        list->set(i, CSSLengthInterpolationType::createNeutralInterpolableValue());
+        list->set(i, LengthInterpolationFunctions::createNeutralInterpolableValue());
     return std::move(list);
 }
 
 PassRefPtr<BasicShape> createBasicShape(const InterpolableValue& interpolableValue, const BasicShapeNonInterpolableValue& nonInterpolableValue, const CSSToLengthConversionData& conversionData)
 {
     RefPtr<BasicShapePolygon> polygon = BasicShapePolygon::create();
     polygon->setWindRule(nonInterpolableValue.windRule());
     const InterpolableList& list = toInterpolableList(interpolableValue);
     size_t size = nonInterpolableValue.size();
     DCHECK_EQ(list.length(), size);
     DCHECK_EQ(size % 2, 0U);
     for (size_t i = 0; i < size; i += 2) {
         polygon->appendPoint(
-            CSSLengthInterpolationType::createLength(*list.get(i), nullptr, conversionData),
-            CSSLengthInterpolationType::createLength(*list.get(i + 1), nullptr, conversionData));
+            LengthInterpolationFunctions::createLength(*list.get(i), nullptr, conversionData, ValueRangeAll),
+            LengthInterpolationFunctions::createLength(*list.get(i + 1), nullptr, conversionData, ValueRangeAll));
     }
     return polygon.release();
 }
 
 } // namespace PolygonFunctions
 
 } // namespace
 
 InterpolationValue BasicShapeInterpolationFunctions::maybeConvertCSSValue(const CSSValue& value)
 {
@@ skipping 62 matching lines @@
         return InsetFunctions::createBasicShape(interpolableValue, conversionData);
     case BasicShape::BasicShapePolygonType:
         return PolygonFunctions::createBasicShape(interpolableValue, nonInterpolableValue, conversionData);
     default:
         NOTREACHED();
         return nullptr;
     }
 }
 
 } // namespace blink