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