Split out String, URI and CustomIdent from CSSPrimitiveValue

Source/core/css/resolver/CSSToStyleMap.cpp

Index: Source/core/css/resolver/CSSToStyleMap.cpp
diff --git a/Source/core/css/resolver/CSSToStyleMap.cpp b/Source/core/css/resolver/CSSToStyleMap.cpp
index b0f7864d72ac445fab15307bf1597d544ddcf0ae..0fe8021d7bdee393d9922b3135a0fe7b62f8fa84 100644
--- a/Source/core/css/resolver/CSSToStyleMap.cpp
+++ b/Source/core/css/resolver/CSSToStyleMap.cpp
@@ -349,10 +349,9 @@ AtomicString CSSToStyleMap::mapAnimationName(CSSValue* value)
 {
     if (value->isInitialValue())
         return CSSAnimationData::initialName();
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    if (primitiveValue->getValueID() == CSSValueNone)
+    if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone)
         return CSSAnimationData::initialName();
-    return AtomicString(primitiveValue->getStringValue());
+    return AtomicString(toCSSStringValue(value)->getStringValue());
 }
 
 EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue* value)
@@ -369,9 +368,9 @@ CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
 {
     if (value->isInitialValue())
         return CSSTransitionData::initialProperty();
+    if (value->isStringValue() && toCSSStringValue(value)->serializationType() == CSSStringValue::SerializeAsCustomIdentifier)
+        return CSSTransitionData::TransitionProperty(toCSSStringValue(value)->getStringValue());
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    if (primitiveValue->isCustomIdent())
-        return CSSTransitionData::TransitionProperty(primitiveValue->getStringValue());
     if (primitiveValue->getValueID() == CSSValueNone)
         return CSSTransitionData::TransitionProperty(CSSTransitionData::TransitionNone);
     return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID());