Index: cc/animation/keyframed_animation_curve.h |
diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h |
index ded48c6721ff28e76886295c00b4163421994559..2fb1888ef6e2c06d5f7b19e400aca11ae22ab951 100644 |
--- a/cc/animation/keyframed_animation_curve.h |
+++ b/cc/animation/keyframed_animation_curve.h |
@@ -121,6 +121,9 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve { |
virtual ~KeyframedColorAnimationCurve(); |
void AddKeyframe(scoped_ptr<ColorKeyframe> keyframe); |
+ void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
+ timing_function_ = timing_function.Pass(); |
+ } |
// AnimationCurve implementation |
virtual double Duration() const OVERRIDE; |
@@ -135,6 +138,7 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve { |
// Always sorted in order of increasing time. No two keyframes have the |
// same time. |
ScopedPtrVector<ColorKeyframe> keyframes_; |
+ scoped_ptr<TimingFunction> timing_function_; |
DISALLOW_COPY_AND_ASSIGN(KeyframedColorAnimationCurve); |
}; |
@@ -147,6 +151,9 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { |
virtual ~KeyframedFloatAnimationCurve(); |
void AddKeyframe(scoped_ptr<FloatKeyframe> keyframe); |
+ void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
+ timing_function_ = timing_function.Pass(); |
+ } |
// AnimationCurve implementation |
virtual double Duration() const OVERRIDE; |
@@ -161,6 +168,7 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve { |
// Always sorted in order of increasing time. No two keyframes have the |
// same time. |
ScopedPtrVector<FloatKeyframe> keyframes_; |
+ scoped_ptr<TimingFunction> timing_function_; |
DISALLOW_COPY_AND_ASSIGN(KeyframedFloatAnimationCurve); |
}; |
@@ -174,6 +182,9 @@ class CC_EXPORT KeyframedTransformAnimationCurve |
virtual ~KeyframedTransformAnimationCurve(); |
void AddKeyframe(scoped_ptr<TransformKeyframe> keyframe); |
+ void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
+ timing_function_ = timing_function.Pass(); |
+ } |
// AnimationCurve implementation |
virtual double Duration() const OVERRIDE; |
@@ -193,6 +204,7 @@ class CC_EXPORT KeyframedTransformAnimationCurve |
// Always sorted in order of increasing time. No two keyframes have the |
// same time. |
ScopedPtrVector<TransformKeyframe> keyframes_; |
+ scoped_ptr<TimingFunction> timing_function_; |
DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve); |
}; |
@@ -206,6 +218,9 @@ class CC_EXPORT KeyframedFilterAnimationCurve |
virtual ~KeyframedFilterAnimationCurve(); |
void AddKeyframe(scoped_ptr<FilterKeyframe> keyframe); |
+ void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) { |
+ timing_function_ = timing_function.Pass(); |
+ } |
// AnimationCurve implementation |
virtual double Duration() const OVERRIDE; |
@@ -221,6 +236,7 @@ class CC_EXPORT KeyframedFilterAnimationCurve |
// Always sorted in order of increasing time. No two keyframes have the |
// same time. |
ScopedPtrVector<FilterKeyframe> keyframes_; |
+ scoped_ptr<TimingFunction> timing_function_; |
DISALLOW_COPY_AND_ASSIGN(KeyframedFilterAnimationCurve); |
}; |