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

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

Issue 194733002: Web Animations: Use StringKeyframes for element.animate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More comments Created 6 years, 8 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/Keyframe.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.h
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
index f1407cc67d2ff0db26465be45bab8b212be1bda5..b0ceb62a6ec6af70fb7d1059555da348515383f0 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -47,6 +47,7 @@
namespace WebCore {
+class Element;
class KeyframeEffectModelTest;
class KeyframeEffectModelBase : public AnimationEffect {
@@ -94,12 +95,20 @@ public:
virtual void trace(Visitor*) OVERRIDE;
+ // FIXME: This is a hack used to resolve CSSValues to AnimatableValues while we have a valid handle on an element.
+ // This should be removed once StringKeyframes no longer uses InterpolableAnimatableValues.
+ void forceConversionsToAnimatableValues(Element* element)
+ {
+ ensureKeyframeGroups();
+ ensureInterpolationEffect(element);
+ }
+
protected:
static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes);
// Lazily computes the groups of property-specific keyframes.
void ensureKeyframeGroups() const;
- void ensureInterpolationEffect() const;
+ void ensureInterpolationEffect(Element* = 0) const;
KeyframeVector m_keyframes;
// The spec describes filtering the normalized keyframes at sampling time
« no previous file with comments | « Source/core/animation/Keyframe.h ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698