Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 348 matching lines @@
     if (toCSSPrimitiveValue(value).getValueID() == CSSValuePaused)
         return AnimPlayStatePaused;
     ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueRunning);
     return AnimPlayStatePlaying;
 }
 
 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(const CSSValue& value)
 {
     if (value.isInitialValue())
         return CSSTransitionData::initialProperty();
-    if (value.isCustomIdentValue())
-        return CSSTransitionData::TransitionProperty(toCSSCustomIdentValue(value).value());
-    const 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.isKnownPropertyID())
+            return CSSTransitionData::TransitionProperty(customIdentValue.valueAsPropertyID());
+        return CSSTransitionData::TransitionProperty(customIdentValue.value());
+    }
+    ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNone);
+    return CSSTransitionData::TransitionProperty(CSSTransitionData::TransitionNone);
 }
 
 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(const CSSValue& value, bool allowStepMiddle)
 {
     // FIXME: We should probably only call into this function with a valid
     // single timing function value which isn't initial or inherit. We can
     // currently get into here with initial since the parser expands unset
     // properties in shorthands to initial.
 
     if (value.isPrimitiveValue()) {
@@ skipping 194 matching lines @@
         verticalRule = SpaceImageRule;
         break;
     default: // CSSValueRepeat
         verticalRule = RepeatImageRule;
         break;
     }
     image.setVerticalRule(verticalRule);
 }
 
 };