| 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 4bbb21111c8aafdab4119820812efc4ddda1b7d1..d9ea1458f96b5909dbbb8a7c0d8d9414eb1ada8b 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -36,7 +36,7 @@
|
| #include "core/animation/AnimationTimeline.h"
|
| #include "core/animation/ElementAnimations.h"
|
| #include "core/animation/InterpolationEnvironment.h"
|
| -#include "core/animation/InvalidatableStyleInterpolation.h"
|
| +#include "core/animation/InvalidatableInterpolation.h"
|
| #include "core/animation/KeyframeEffect.h"
|
| #include "core/animation/StyleInterpolation.h"
|
| #include "core/animation/animatable/AnimatableValue.h"
|
| @@ -967,9 +967,9 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act
|
| if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
|
| continue;
|
| const Interpolation& interpolation = *interpolationsVectorEntry.value.first();
|
| - if (interpolation.isInvalidatableStyleInterpolation()) {
|
| + if (interpolation.isInvalidatableInterpolation()) {
|
| InterpolationEnvironment environment(state);
|
| - InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntry.value, environment);
|
| + InvalidatableInterpolation::applyStack(interpolationsVectorEntry.value, environment);
|
| } else {
|
| // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
|
| toStyleInterpolation(interpolation).apply(state);
|
|
|