Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 1394343003: Web Animations: Remove CSS dependence from InterpolationType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_specialCase0and1
Patch Set: NIVs Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/animation/StringKeyframe.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 325378a5146f92bb151fc28454fd6a1e57be3cc1..4bbb21111c8aafdab4119820812efc4ddda1b7d1 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -35,6 +35,7 @@
#include "core/StylePropertyShorthand.h"
#include "core/animation/AnimationTimeline.h"
#include "core/animation/ElementAnimations.h"
+#include "core/animation/InterpolationEnvironment.h"
#include "core/animation/InvalidatableStyleInterpolation.h"
#include "core/animation/KeyframeEffect.h"
#include "core/animation/StyleInterpolation.h"
@@ -967,7 +968,8 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Act
continue;
const Interpolation& interpolation = *interpolationsVectorEntry.value.first();
if (interpolation.isInvalidatableStyleInterpolation()) {
- InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntry.value, state);
+ InterpolationEnvironment environment(state);
+ InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntry.value, environment);
} else {
// TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
toStyleInterpolation(interpolation).apply(state);
« no previous file with comments | « third_party/WebKit/Source/core/animation/StringKeyframe.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698