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 9791d32fe95a90f8533312f0d90ac88f995686f3..967086b54cf8db73cadc2d6a479e4b10bb36ee89 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp |
@@ -366,12 +366,14 @@ CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(const |
{ |
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) |