diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
| commit | c753e25a8b4366c44134a8c21b9ed3392bf48608 (patch) | |
| tree | f378c8a762caccf60856a1670ae33dfd638b9453 /cc/keyframed_animation_curve.h | |
| parent | 503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff) | |
| download | chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.zip chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.gz chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.bz2 | |
Revert "cc: Rename cc classes and members to match filenames"
This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/keyframed_animation_curve.h')
| -rw-r--r-- | cc/keyframed_animation_curve.h | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h index 14eb869..066e5c6 100644 --- a/cc/keyframed_animation_curve.h +++ b/cc/keyframed_animation_curve.h @@ -12,96 +12,96 @@ namespace cc { -class Keyframe { +class CCKeyframe { public: double time() const; - const TimingFunction* timingFunction() const; + const CCTimingFunction* timingFunction() const; protected: - Keyframe(double time, scoped_ptr<TimingFunction>); - virtual ~Keyframe(); + CCKeyframe(double time, scoped_ptr<CCTimingFunction>); + virtual ~CCKeyframe(); private: double m_time; - scoped_ptr<TimingFunction> m_timingFunction; + scoped_ptr<CCTimingFunction> m_timingFunction; }; -class FloatKeyframe : public Keyframe { +class CCFloatKeyframe : public CCKeyframe { public: - static scoped_ptr<FloatKeyframe> create(double time, float value, scoped_ptr<TimingFunction>); - virtual ~FloatKeyframe(); + static scoped_ptr<CCFloatKeyframe> create(double time, float value, scoped_ptr<CCTimingFunction>); + virtual ~CCFloatKeyframe(); float value() const; - scoped_ptr<FloatKeyframe> clone() const; + scoped_ptr<CCFloatKeyframe> clone() const; private: - FloatKeyframe(double time, float value, scoped_ptr<TimingFunction>); + CCFloatKeyframe(double time, float value, scoped_ptr<CCTimingFunction>); float m_value; }; -class TransformKeyframe : public Keyframe { +class CCTransformKeyframe : public CCKeyframe { public: - static scoped_ptr<TransformKeyframe> create(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction>); - virtual ~TransformKeyframe(); + static scoped_ptr<CCTransformKeyframe> create(double time, const WebKit::WebTransformOperations& value, scoped_ptr<CCTimingFunction>); + virtual ~CCTransformKeyframe(); const WebKit::WebTransformOperations& value() const; - scoped_ptr<TransformKeyframe> clone() const; + scoped_ptr<CCTransformKeyframe> clone() const; private: - TransformKeyframe(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction>); + CCTransformKeyframe(double time, const WebKit::WebTransformOperations& value, scoped_ptr<CCTimingFunction>); WebKit::WebTransformOperations m_value; }; -class KeyframedFloatAnimationCurve : public FloatAnimationCurve { +class CCKeyframedFloatAnimationCurve : public CCFloatAnimationCurve { public: // It is required that the keyframes be sorted by time. - static scoped_ptr<KeyframedFloatAnimationCurve> create(); + static scoped_ptr<CCKeyframedFloatAnimationCurve> create(); - virtual ~KeyframedFloatAnimationCurve(); + virtual ~CCKeyframedFloatAnimationCurve(); - void addKeyframe(scoped_ptr<FloatKeyframe>); + void addKeyframe(scoped_ptr<CCFloatKeyframe>); - // AnimationCurve implementation + // CCAnimationCurve implementation virtual double duration() const OVERRIDE; - virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE; - // FloatAnimationCurve implementation + // CCFloatAnimationCurve implementation virtual float getValue(double t) const OVERRIDE; private: - KeyframedFloatAnimationCurve(); + CCKeyframedFloatAnimationCurve(); // Always sorted in order of increasing time. No two keyframes have the // same time. - ScopedPtrVector<FloatKeyframe> m_keyframes; + ScopedPtrVector<CCFloatKeyframe> m_keyframes; }; -class KeyframedTransformAnimationCurve : public TransformAnimationCurve { +class CCKeyframedTransformAnimationCurve : public CCTransformAnimationCurve { public: // It is required that the keyframes be sorted by time. - static scoped_ptr<KeyframedTransformAnimationCurve> create(); + static scoped_ptr<CCKeyframedTransformAnimationCurve> create(); - virtual ~KeyframedTransformAnimationCurve(); + virtual ~CCKeyframedTransformAnimationCurve(); - void addKeyframe(scoped_ptr<TransformKeyframe>); + void addKeyframe(scoped_ptr<CCTransformKeyframe>); - // AnimationCurve implementation + // CCAnimationCurve implementation virtual double duration() const OVERRIDE; - virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE; - // TransformAnimationCurve implementation + // CCTransformAnimationCurve implementation virtual WebKit::WebTransformationMatrix getValue(double t) const OVERRIDE; private: - KeyframedTransformAnimationCurve(); + CCKeyframedTransformAnimationCurve(); // Always sorted in order of increasing time. No two keyframes have the // same time. - ScopedPtrVector<TransformKeyframe> m_keyframes; + ScopedPtrVector<CCTransformKeyframe> m_keyframes; }; } // namespace cc |