Split out String, URI and CustomIdent from CSSPrimitiveValue

third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp

Index: third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
index 4b6cae74de52dccf06e8c844e8d384739bfbcbaa..de5f8a2f3de2c303d5c596146acfe46f960bab66 100644
--- a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
@@ -31,6 +31,7 @@
 #include "core/CSSValueKeywords.h"
 #include "core/animation/css/CSSAnimationData.h"
 #include "core/css/CSSBorderImageSliceValue.h"
+#include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
@@ -347,10 +348,10 @@ AtomicString CSSToStyleMap::mapAnimationName(CSSValue* value)
 {
     if (value->isInitialValue())
         return CSSAnimationData::initialName();
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    if (primitiveValue->getValueID() == CSSValueNone)
-        return CSSAnimationData::initialName();
-    return AtomicString(primitiveValue->getStringValue());
+    if (value->isCustomIdentValue())
+        return AtomicString(toCSSCustomIdentValue(value)->value());
+    ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
+    return CSSAnimationData::initialName();
 }
 
 EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue* value)
@@ -367,9 +368,9 @@ CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
 {
     if (value->isInitialValue())
         return CSSTransitionData::initialProperty();
+    if (value->isCustomIdentValue())
+        return CSSTransitionData::TransitionProperty(toCSSCustomIdentValue(value)->value());
     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());