| 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 be12c3bee157f07c4b386dead89d440319fd2ecb..7612822a3b872abc7cfafcbf871758b387a0f8f1 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -41,6 +41,7 @@
|
| #include "core/animation/InvalidatableInterpolation.h"
|
| #include "core/animation/KeyframeEffect.h"
|
| #include "core/animation/LegacyStyleInterpolation.h"
|
| +#include "core/animation/TransitionInterpolation.h"
|
| #include "core/animation/animatable/AnimatableValue.h"
|
| #include "core/animation/css/CSSAnimatableValueFactory.h"
|
| #include "core/animation/css/CSSAnimations.h"
|
| @@ -1181,9 +1182,10 @@ void StyleResolver::applyAnimatedProperties(
|
| CSSInterpolationTypesMap map(state.document().propertyRegistry());
|
| InterpolationEnvironment environment(map, state);
|
| InvalidatableInterpolation::applyStack(entry.value, environment);
|
| + } else if (interpolation.isTransitionInterpolation()) {
|
| + toTransitionInterpolation(interpolation).apply(state);
|
| } else {
|
| - // TODO(alancutter): Remove this old code path once animations have
|
| - // completely migrated to InterpolationTypes.
|
| + // TODO(alancutter): Move CustomCompositorAnimations off AnimatableValues.
|
| toLegacyStyleInterpolation(interpolation).apply(state);
|
| }
|
| }
|
|
|