| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| index f7e938460cbf8fdbe46f7c75729baf5a952e02ad..6ed6197f42206fba789d02c695d9109d461d81d5 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -1130,20 +1130,20 @@ bool StyleResolver::applyAnimatedStandardProperties(
|
|
|
| const ActiveInterpolationsMap& activeInterpolationsMapForAnimations =
|
| state.animationUpdate().activeInterpolationsForAnimations();
|
| - const ActiveInterpolationsMap& activeInterpolationsMapForTransitions =
|
| - state.animationUpdate().activeInterpolationsForTransitions();
|
| + const ActiveInterpolationsMap& activeInterpolationsMapForStandardTransitions =
|
| + state.animationUpdate().activeInterpolationsForStandardTransitions();
|
| // TODO(crbug.com/644148): Apply animations on custom properties.
|
| applyAnimatedProperties<HighPropertyPriority>(
|
| state, activeInterpolationsMapForAnimations);
|
| applyAnimatedProperties<HighPropertyPriority>(
|
| - state, activeInterpolationsMapForTransitions);
|
| + state, activeInterpolationsMapForStandardTransitions);
|
|
|
| updateFont(state);
|
|
|
| applyAnimatedProperties<LowPropertyPriority>(
|
| state, activeInterpolationsMapForAnimations);
|
| applyAnimatedProperties<LowPropertyPriority>(
|
| - state, activeInterpolationsMapForTransitions);
|
| + state, activeInterpolationsMapForStandardTransitions);
|
|
|
| // Start loading resources used by animations.
|
| loadPendingResources(state);
|
|
|