Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

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

Index: third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
diff --git a/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
index a9d2ec868427816843ebc72d520af48ed4443863..eccc0a8cc8a46a5e3bb8fc8e9a04cc04d3980bd2 100644
--- a/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
+++ b/third_party/WebKit/Source/core/animation/SizeInterpolationFunctions.cpp
@@ -6,6 +6,7 @@
 
 #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"
 
@@ -103,18 +104,17 @@ InterpolationValue SizeInterpolationFunctions::maybeConvertCSSSizeSide(
   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)