| Index: Source/core/animation/css/CSSTransitionData.h
|
| diff --git a/Source/core/animation/css/CSSTransitionData.h b/Source/core/animation/css/CSSTransitionData.h
|
| index 801e2f77aa427e38143737f4631d7ffdc974f53c..fc9d1c9db567f9f16118ac8c1404a61eedeb2210 100644
|
| --- a/Source/core/animation/css/CSSTransitionData.h
|
| +++ b/Source/core/animation/css/CSSTransitionData.h
|
| @@ -24,29 +24,29 @@ public:
|
| struct TransitionProperty {
|
| TransitionProperty(CSSPropertyID id)
|
| : propertyType(TransitionSingleProperty)
|
| - , propertyId(id)
|
| + , unresolvedProperty(id)
|
| {
|
| ASSERT(id != CSSPropertyInvalid);
|
| }
|
|
|
| TransitionProperty(const String& string)
|
| : propertyType(TransitionUnknown)
|
| - , propertyId(CSSPropertyInvalid)
|
| + , unresolvedProperty(CSSPropertyInvalid)
|
| , propertyString(string)
|
| {
|
| }
|
|
|
| TransitionProperty(TransitionPropertyType type)
|
| : propertyType(type)
|
| - , propertyId(CSSPropertyInvalid)
|
| + , unresolvedProperty(CSSPropertyInvalid)
|
| {
|
| ASSERT(type == TransitionNone || type == TransitionAll);
|
| }
|
|
|
| - bool operator==(const TransitionProperty& other) const { return propertyType == other.propertyType && propertyId == other.propertyId && propertyString == other.propertyString; }
|
| + bool operator==(const TransitionProperty& other) const { return propertyType == other.propertyType && unresolvedProperty == other.unresolvedProperty && propertyString == other.propertyString; }
|
|
|
| TransitionPropertyType propertyType;
|
| - CSSPropertyID propertyId;
|
| + CSSPropertyID unresolvedProperty;
|
| String propertyString;
|
| };
|
|
|
|
|