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

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

Issue 196053009: Web Animations API: Constructing an Animation from a partial keyframe throws a JS exception (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@SyntheticKeyframesFix
Patch Set: Created 6 years, 9 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/ElementAnimation.idl ('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 e098a161eb417e38c001c178d34ec2276fabc779..e22831ec109b5b5e11e37b63d43eb17536f4420e 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -109,6 +109,8 @@ public:
virtual bool isKeyframeEffectModel() const OVERRIDE { return true; }
+ bool isReplaceOnly();
+
PropertySet properties() const;
class PropertySpecificKeyframe {
@@ -117,13 +119,15 @@ public:
double offset() const { return m_offset; }
TimingFunction* easing() const { return m_easing.get(); }
const AnimatableValue* value() const { return m_value.get(); }
+ AnimationEffect::CompositeOperation composite() const { return m_composite; }
PassOwnPtr<PropertySpecificKeyframe> cloneWithOffset(double offset) const;
private:
// Used by cloneWithOffset().
- PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>);
+ PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, PassRefPtr<AnimatableValue>, CompositeOperation);
double m_offset;
RefPtr<TimingFunction> m_easing;
RefPtr<AnimatableValue> m_value;
+ AnimationEffect::CompositeOperation m_composite;
};
class PropertySpecificKeyframeGroup {
« no previous file with comments | « Source/core/animation/ElementAnimation.idl ('k') | Source/core/animation/KeyframeEffectModel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698