CC: Add curve (whole animation) timing function to compositor animations.

cc/animation/keyframed_animation_curve.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/timing_function.h"
 #include "cc/animation/transform_operations.h"
@@ skipping 103 matching lines @@
 };
 
 class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedColorAnimationCurve> Create();
 
   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;
   virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
 
   // BackgrounColorAnimationCurve implementation
   virtual SkColor GetValue(double t) const OVERRIDE;
 
  private:
   KeyframedColorAnimationCurve();
 
   // 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);
 };
 
 class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedFloatAnimationCurve> Create();
 
   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;
   virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
 
   // FloatAnimationCurve implementation
   virtual float GetValue(double t) const OVERRIDE;
 
  private:
   KeyframedFloatAnimationCurve();
 
   // 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);
 };
 
 class CC_EXPORT KeyframedTransformAnimationCurve
     : public TransformAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedTransformAnimationCurve> Create();
 
   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;
   virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
 
   // TransformAnimationCurve implementation
   virtual gfx::Transform GetValue(double t) const OVERRIDE;
   virtual bool AnimatedBoundsForBox(const gfx::BoxF& box,
                                     gfx::BoxF* bounds) const OVERRIDE;
   virtual bool AffectsScale() const OVERRIDE;
   virtual bool IsTranslation() const OVERRIDE;
   virtual bool MaximumScale(float* max_scale) const OVERRIDE;
 
  private:
   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);
 };
 
 class CC_EXPORT KeyframedFilterAnimationCurve
     : public FilterAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedFilterAnimationCurve> Create();
 
   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;
   virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE;
 
   // FilterAnimationCurve implementation
   virtual FilterOperations GetValue(double t) const OVERRIDE;
   virtual bool HasFilterThatMovesPixels() const OVERRIDE;
 
  private:
   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);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_