Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.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/CSSBorderImageLengthBoxInterpolationType.h"
 
 #include "core/animation/BorderImageLengthBoxPropertyFunctions.h"
 #include "core/animation/LengthInterpolationFunctions.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/resolver/StyleResolverState.h"
@@ skipping 15 matching lines @@
 struct SideNumbers {
     explicit SideNumbers(const BorderImageLengthBox& box)
     {
         isNumber[SideTop] = box.top().isNumber();
         isNumber[SideRight] = box.right().isNumber();
         isNumber[SideBottom] = box.bottom().isNumber();
         isNumber[SideLeft] = box.left().isNumber();
     }
     explicit SideNumbers(const CSSQuadValue& quad)
     {
-        isNumber[SideTop] = quad.top()->isNumber();
-        isNumber[SideRight] = quad.right()->isNumber();
-        isNumber[SideBottom] = quad.bottom()->isNumber();
-        isNumber[SideLeft] = quad.left()->isNumber();
+        isNumber[SideTop] = quad.top()->isPrimitiveValue() && toCSSPrimitiveValue(quad.top())->isNumber();
+        isNumber[SideRight] = quad.right()->isPrimitiveValue() && toCSSPrimitiveValue(quad.right())->isNumber();
+        isNumber[SideBottom] = quad.bottom()->isPrimitiveValue() && toCSSPrimitiveValue(quad.bottom())->isNumber();
+        isNumber[SideLeft] = quad.left()->isPrimitiveValue() && toCSSPrimitiveValue(quad.left())->isNumber();
     }
 
     bool operator==(const SideNumbers& other) const
     {
         for (size_t i = 0; i < SideIndexCount; i++) {
             if (isNumber[i] != other.isNumber[i])
                 return false;
         }
         return true;
     }
@@ skipping 138 matching lines @@
 }
 
 InterpolationValue CSSBorderImageLengthBoxInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const
 {
     if (!value.isQuadValue())
         return nullptr;
 
     const CSSQuadValue& quad = toCSSQuadValue(value);
     std::unique_ptr<InterpolableList> list = InterpolableList::create(SideIndexCount);
     Vector<RefPtr<NonInterpolableValue>> nonInterpolableValues(SideIndexCount);
-    const CSSPrimitiveValue* sides[SideIndexCount] = {};
+    const CSSValue* sides[SideIndexCount] = {};
     sides[SideTop] = quad.top();
     sides[SideRight] = quad.right();
     sides[SideBottom] = quad.bottom();
     sides[SideLeft] = quad.left();
 
     for (size_t i = 0; i < SideIndexCount; i++) {
-        const CSSPrimitiveValue& side = *sides[i];
-        if (side.isNumber()) {
-            list->set(i, InterpolableNumber::create(side.getDoubleValue()));
+        const CSSValue& side = *sides[i];
+        if (side.isPrimitiveValue() && toCSSPrimitiveValue(side).isNumber()) {
+            list->set(i, InterpolableNumber::create(toCSSPrimitiveValue(side).getDoubleValue()));
         } else {
             InterpolationValue convertedSide = LengthInterpolationFunctions::maybeConvertCSSValue(side);
             if (!convertedSide)
                 return nullptr;
             list->set(i, std::move(convertedSide.interpolableValue));
             nonInterpolableValues[i] = convertedSide.nonInterpolableValue.release();
         }
     }
 
     return InterpolationValue(std::move(list), CSSBorderImageLengthBoxNonInterpolableValue::create(SideNumbers(quad), std::move(nonInterpolableValues)));
@@ skipping 53 matching lines @@
     };
     BorderImageLengthBox box(
         convertSide(SideTop),
         convertSide(SideRight),
         convertSide(SideBottom),
         convertSide(SideLeft));
     BorderImageLengthBoxPropertyFunctions::setBorderImageLengthBox(cssProperty(), *environment.state().style(), box);
 }
 
 } // namespace blink