Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue

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 f0ac5560074e13fb2751e0db3105046f763d5429..a67119689b19c12099fbb71feccf23e53f7d338b 100644
--- a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp
@@ -349,7 +349,7 @@ AtomicString CSSToStyleMap::mapAnimationName(CSSValue* value)
         return CSSAnimationData::initialName();
     if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone)
         return CSSAnimationData::initialName();
-    return AtomicString(toCSSCustomIdentValue(value)->value());
+    return AtomicString(toCSSCustomIdentValue(value)->string());
 }
 
 EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue* value)
@@ -366,12 +366,14 @@ 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->getValueID() == CSSValueNone)
-        return CSSTransitionData::TransitionProperty(CSSTransitionData::TransitionNone);
-    return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID());
+    if (value->isCustomIdentValue()) {
+        const CSSCustomIdentValue& customIdentValue = toCSSCustomIdentValue(*value);
+        if (customIdentValue.isValidPropertyID())
+            return CSSTransitionData::TransitionProperty(customIdentValue.id());
+        return CSSTransitionData::TransitionProperty(customIdentValue.string());
+    }
+    ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
+    return CSSTransitionData::TransitionProperty(CSSTransitionData::TransitionNone);
 }
 
 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* value, bool allowStepMiddle)