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

Unified Diff: Source/core/animation/InvalidatableStyleInterpolation.h

Issue 1329843002: Support per property CSS Animation stacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Lint Created 5 years, 3 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 | « Source/core/animation/Interpolation.h ('k') | Source/core/animation/InvalidatableStyleInterpolation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InvalidatableStyleInterpolation.h
diff --git a/Source/core/animation/InvalidatableStyleInterpolation.h b/Source/core/animation/InvalidatableStyleInterpolation.h
index 3dc63896432e5a04cc1f1f7aa74220c34937d7a7..a59c47129358f83d4add6c9b44bd4f4ba2fdc66e 100644
--- a/Source/core/animation/InvalidatableStyleInterpolation.h
+++ b/Source/core/animation/InvalidatableStyleInterpolation.h
@@ -26,7 +26,9 @@ public:
}
virtual void interpolate(int iteration, double fraction);
- virtual void apply(StyleResolverState&) const;
+ bool dependsOnUnderlyingValue() const;
+ virtual void apply(StyleResolverState&) const { ASSERT_NOT_REACHED(); }
+ static void applyStack(const ActiveInterpolations&, StyleResolverState&);
virtual bool isInvalidatableStyleInterpolation() const { return true; }
@@ -37,8 +39,7 @@ private:
const CSSPropertySpecificKeyframe& endKeyframe);
PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const;
- void ensureValidInterpolation(const StyleResolverState&, const InterpolationValue* underlyingValue) const;
- bool dependsOnUnderlyingValue() const;
+ const InterpolationValue* ensureValidInterpolation(const StyleResolverState&, const InterpolationValue* underlyingValue) const;
bool isCacheValid(const StyleResolverState&, const InterpolationValue* underlyingValue) const;
bool isNeutralKeyframeActive() const;
bool maybeCachePairwiseConversion(const StyleResolverState*, const InterpolationValue* underlyingValue) const;
« no previous file with comments | « Source/core/animation/Interpolation.h ('k') | Source/core/animation/InvalidatableStyleInterpolation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698