Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.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/SizeInterpolationFunctions.h"
 
 #include "core/animation/LengthInterpolationFunctions.h"
 #include "core/animation/UnderlyingValueOwner.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/CSSValuePair.h"
 
 namespace blink {
 
 class CSSSizeNonInterpolableValue : public NonInterpolableValue {
 public:
     static PassRefPtr<CSSSizeNonInterpolableValue> create(CSSValueID keyword)
     {
         return adoptRef(new CSSSizeNonInterpolableValue(keyword));
@@ skipping 64 matching lines @@
         NOTREACHED();
         return nullptr;
     }
 }
 
 InterpolationValue SizeInterpolationFunctions::maybeConvertCSSSizeSide(const CSSValue& value, bool convertWidth)
 {
     if (value.isValuePair()) {
         const CSSValuePair& pair = toCSSValuePair(value);
         const CSSValue& side = convertWidth ? pair.first() : pair.second();
-        if (side.isPrimitiveValue() && toCSSPrimitiveValue(side).getValueID() == CSSValueAuto)
+        if (side.isIdentifierValue() && toCSSIdentifierValue(side).getValueID() == CSSValueAuto)
             return convertKeyword(CSSValueAuto);
         return wrapConvertedLength(LengthInterpolationFunctions::maybeConvertCSSValue(side));
     }
 
-    if (!value.isPrimitiveValue())
+    if (!value.isIdentifierValue() && !value.isPrimitiveValue())
         return nullptr;
-    CSSValueID keyword = toCSSPrimitiveValue(value).getValueID();
-    if (keyword)
-        return convertKeyword(keyword);
+    if (value.isIdentifierValue())
+        return convertKeyword(toCSSIdentifierValue(value).getValueID());
 
     // A single length is equivalent to "<length> auto".
     if (convertWidth)
         return wrapConvertedLength(LengthInterpolationFunctions::maybeConvertCSSValue(value));
     return convertKeyword(CSSValueAuto);
 }
 
 PairwiseInterpolationValue SizeInterpolationFunctions::maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end)
 {
     if (!nonInterpolableValuesAreCompatible(start.nonInterpolableValue.get(), end.nonInterpolableValue.get()))
@@ skipping 64 matching lines @@
             NOTREACHED();
             break;
         }
     }
     return FillSize(SizeLength, LengthSize(
         createLength(interpolableValueA, sideA, conversionData),
         createLength(interpolableValueB, sideB, conversionData)));
 }
 
 } // namespace blink