| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index bd47b0b5f3ccfc5f322466d9ff547dd5ef3c732e..c67f719a667f91c2df9d719afdd4c2794eefa90c 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -538,13 +538,11 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate& update, const
|
|
|
| for (size_t i = 0; i < transitionData->propertyList().size(); ++i) {
|
| const CSSTransitionData::TransitionProperty& transitionProperty = transitionData->propertyList()[i];
|
| - CSSTransitionData::TransitionPropertyType mode = transitionProperty.propertyType;
|
| - CSSPropertyID property = resolveCSSPropertyID(transitionProperty.unresolvedProperty);
|
| - if (mode == CSSTransitionData::TransitionNone || mode == CSSTransitionData::TransitionUnknown)
|
| + if (transitionProperty.propertyType != CSSTransitionData::TransitionKnownProperty)
|
| continue;
|
|
|
| - bool animateAll = mode == CSSTransitionData::TransitionAll;
|
| - ASSERT(animateAll || mode == CSSTransitionData::TransitionSingleProperty);
|
| + CSSPropertyID property = resolveCSSPropertyID(transitionProperty.unresolvedProperty);
|
| + bool animateAll = property == CSSPropertyAll;
|
| if (animateAll)
|
| anyTransitionHadTransitionAll = true;
|
| const StylePropertyShorthand& propertyList = animateAll ? CSSAnimations::propertiesForTransitionAll() : shorthandForProperty(property);
|
|
|