diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
| commit | 96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch) | |
| tree | 4332d128a05777ae34641ca2f185b7b548330b8d /cc/keyframed_animation_curve.h | |
| parent | 1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff) | |
| download | chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2 | |
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/
TBR=jam@chromium.org,jamesr@chromium.org
BUG=155413
Review URL: https://codereview.chromium.org/11231054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 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 236a20f..881ef03 100644 --- a/cc/keyframed_animation_curve.h +++ b/cc/keyframed_animation_curve.h @@ -12,96 +12,96 @@ namespace cc { -class CCKeyframe { +class Keyframe { public: double time() const; - const CCTimingFunction* timingFunction() const; + const TimingFunction* timingFunction() const; protected: - CCKeyframe(double time, scoped_ptr<CCTimingFunction>); - virtual ~CCKeyframe(); + Keyframe(double time, scoped_ptr<TimingFunction>); + virtual ~Keyframe(); private: double m_time; - scoped_ptr<CCTimingFunction> m_timingFunction; + scoped_ptr<TimingFunction> m_timingFunction; }; -class CCFloatKeyframe : public CCKeyframe { +class FloatKeyframe : public Keyframe { public: - static scoped_ptr<CCFloatKeyframe> create(double time, float value, scoped_ptr<CCTimingFunction>); - virtual ~CCFloatKeyframe(); + static scoped_ptr<FloatKeyframe> create(double time, float value, scoped_ptr<TimingFunction>); + virtual ~FloatKeyframe(); float value() const; - scoped_ptr<CCFloatKeyframe> clone() const; + scoped_ptr<FloatKeyframe> clone() const; private: - CCFloatKeyframe(double time, float value, scoped_ptr<CCTimingFunction>); + FloatKeyframe(double time, float value, scoped_ptr<TimingFunction>); float m_value; }; -class CCTransformKeyframe : public CCKeyframe { +class TransformKeyframe : public Keyframe { public: - static scoped_ptr<CCTransformKeyframe> create(double time, const WebKit::WebTransformOperations& value, scoped_ptr<CCTimingFunction>); - virtual ~CCTransformKeyframe(); + static scoped_ptr<TransformKeyframe> create(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction>); + virtual ~TransformKeyframe(); const WebKit::WebTransformOperations& value() const; - scoped_ptr<CCTransformKeyframe> clone() const; + scoped_ptr<TransformKeyframe> clone() const; private: - CCTransformKeyframe(double time, const WebKit::WebTransformOperations& value, scoped_ptr<CCTimingFunction>); + TransformKeyframe(double time, const WebKit::WebTransformOperations& value, scoped_ptr<TimingFunction>); WebKit::WebTransformOperations m_value; }; -class CCKeyframedFloatAnimationCurve : public CCFloatAnimationCurve { +class KeyframedFloatAnimationCurve : public FloatAnimationCurve { public: // It is required that the keyframes be sorted by time. - static scoped_ptr<CCKeyframedFloatAnimationCurve> create(); + static scoped_ptr<KeyframedFloatAnimationCurve> create(); - virtual ~CCKeyframedFloatAnimationCurve(); + virtual ~KeyframedFloatAnimationCurve(); - void addKeyframe(scoped_ptr<CCFloatKeyframe>); + void addKeyframe(scoped_ptr<FloatKeyframe>); - // CCAnimationCurve implementation + // AnimationCurve implementation virtual double duration() const OVERRIDE; - virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE; - // CCFloatAnimationCurve implementation + // FloatAnimationCurve implementation virtual float getValue(double t) const OVERRIDE; private: - CCKeyframedFloatAnimationCurve(); + KeyframedFloatAnimationCurve(); // Always sorted in order of increasing time. No two keyframes have the // same time. - ScopedPtrVector<CCFloatKeyframe> m_keyframes; + ScopedPtrVector<FloatKeyframe> m_keyframes; }; -class CCKeyframedTransformAnimationCurve : public CCTransformAnimationCurve { +class KeyframedTransformAnimationCurve : public TransformAnimationCurve { public: // It is required that the keyframes be sorted by time. - static scoped_ptr<CCKeyframedTransformAnimationCurve> create(); + static scoped_ptr<KeyframedTransformAnimationCurve> create(); - virtual ~CCKeyframedTransformAnimationCurve(); + virtual ~KeyframedTransformAnimationCurve(); - void addKeyframe(scoped_ptr<CCTransformKeyframe>); + void addKeyframe(scoped_ptr<TransformKeyframe>); - // CCAnimationCurve implementation + // AnimationCurve implementation virtual double duration() const OVERRIDE; - virtual scoped_ptr<CCAnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<AnimationCurve> clone() const OVERRIDE; - // CCTransformAnimationCurve implementation + // TransformAnimationCurve implementation virtual WebKit::WebTransformationMatrix getValue(double t) const OVERRIDE; private: - CCKeyframedTransformAnimationCurve(); + KeyframedTransformAnimationCurve(); // Always sorted in order of increasing time. No two keyframes have the // same time. - ScopedPtrVector<CCTransformKeyframe> m_keyframes; + ScopedPtrVector<TransformKeyframe> m_keyframes; }; } // namespace cc |