Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.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/CSSImageSliceInterpolationType.h"
 
 #include "core/animation/CSSLengthInterpolationType.h"
 #include "core/animation/ImageSlicePropertyFunctions.h"
 #include "core/css/CSSBorderImageSliceValue.h"
 #include "core/css/resolver/StyleResolverState.h"
@@ skipping 16 matching lines @@
     explicit SliceTypes(const ImageSlice& slice)
     {
         isNumber[SideTop] = slice.slices.top().isFixed();
         isNumber[SideRight] = slice.slices.right().isFixed();
         isNumber[SideBottom] = slice.slices.bottom().isFixed();
         isNumber[SideLeft] = slice.slices.left().isFixed();
         fill = slice.fill;
     }
     explicit SliceTypes(const CSSBorderImageSliceValue& slice)
     {
-        isNumber[SideTop] = slice.slices().top()->isNumber();
-        isNumber[SideRight] = slice.slices().right()->isNumber();
-        isNumber[SideBottom] = slice.slices().bottom()->isNumber();
-        isNumber[SideLeft] = slice.slices().left()->isNumber();
+        isNumber[SideTop] = slice.slices().top()->isPrimitiveValue() && toCSSPrimitiveValue(slice.slices().top())->isNumber();
+        isNumber[SideRight] = slice.slices().right()->isPrimitiveValue() && toCSSPrimitiveValue(slice.slices().right())->isNumber();
+        isNumber[SideBottom] = slice.slices().bottom()->isPrimitiveValue() && toCSSPrimitiveValue(slice.slices().bottom())->isNumber();
+        isNumber[SideLeft] = slice.slices().left()->isPrimitiveValue() && toCSSPrimitiveValue(slice.slices().left())->isNumber();
         fill = slice.fill();
     }
 
     bool operator==(const SliceTypes& other) const
     {
         for (size_t i = 0; i < SideIndexCount; i++) {
             if (isNumber[i] != other.isNumber[i])
                 return false;
         }
         return fill == other.fill;
@@ skipping 121 matching lines @@
     return convertImageSlice(inheritedImageSlice, state.parentStyle()->effectiveZoom());
 }
 
 InterpolationValue CSSImageSliceInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const
 {
     if (!value.isBorderImageSliceValue())
         return nullptr;
 
     const CSSBorderImageSliceValue& slice = toCSSBorderImageSliceValue(value);
     std::unique_ptr<InterpolableList> list = InterpolableList::create(SideIndexCount);
-    const CSSPrimitiveValue* sides[SideIndexCount];
+    const CSSValue* sides[SideIndexCount];
     sides[SideTop] = slice.slices().top();
     sides[SideRight] = slice.slices().right();
     sides[SideBottom] = slice.slices().bottom();
     sides[SideLeft] = slice.slices().left();
 
     for (size_t i = 0; i < SideIndexCount; i++) {
-        const CSSPrimitiveValue& side = *sides[i];
+        const CSSPrimitiveValue& side = *toCSSPrimitiveValue(sides[i]);
         DCHECK(side.isNumber() || side.isPercentage());
         list->set(i, InterpolableNumber::create(side.getDoubleValue()));
     }
 
     return InterpolationValue(std::move(list), CSSImageSliceNonInterpolableValue::create(SliceTypes(slice)));
 }
 
 InterpolationValue CSSImageSliceInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
 {
     const ComputedStyle& style = *environment.state().style();
@@ skipping 34 matching lines @@
     };
     LengthBox box(
         convertSide(SideTop),
         convertSide(SideRight),
         convertSide(SideBottom),
         convertSide(SideLeft));
     ImageSlicePropertyFunctions::setImageSlice(cssProperty(), style, ImageSlice(box, types.fill));
 }
 
 } // namespace blink