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/test/animation_test_common.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/test/animation_test_common.h')
-rw-r--r-- | cc/test/animation_test_common.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h index 8c00efb..a768930 100644 --- a/cc/test/animation_test_common.h +++ b/cc/test/animation_test_common.h @@ -11,13 +11,13 @@ #include "IntSize.h" namespace cc { -class LayerImpl; -class Layer; +class CCLayerImpl; +class LayerChromium; } namespace WebKitTests { -class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { +class FakeFloatAnimationCurve : public cc::CCFloatAnimationCurve { public: FakeFloatAnimationCurve(); explicit FakeFloatAnimationCurve(double duration); @@ -25,13 +25,13 @@ public: virtual double duration() const OVERRIDE; virtual float getValue(double now) const OVERRIDE; - virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE; private: double m_duration; }; -class FakeTransformTransition : public cc::TransformAnimationCurve { +class FakeTransformTransition : public cc::CCTransformAnimationCurve { public: FakeTransformTransition(double duration); virtual ~FakeTransformTransition(); @@ -39,13 +39,13 @@ public: virtual double duration() const OVERRIDE; virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE; - virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE; private: double m_duration; }; -class FakeFloatTransition : public cc::FloatAnimationCurve { +class FakeFloatTransition : public cc::CCFloatAnimationCurve { public: FakeFloatTransition(double duration, float from, float to); virtual ~FakeFloatTransition(); @@ -53,7 +53,7 @@ public: virtual double duration() const OVERRIDE; virtual float getValue(double time) const OVERRIDE; - virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE; + virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE; private: double m_duration; @@ -61,12 +61,12 @@ private: float m_to; }; -class FakeLayerAnimationControllerClient : public cc::LayerAnimationControllerClient { +class FakeLayerAnimationControllerClient : public cc::CCLayerAnimationControllerClient { public: FakeLayerAnimationControllerClient(); virtual ~FakeLayerAnimationControllerClient(); - // LayerAnimationControllerClient implementation + // CCLayerAnimationControllerClient implementation virtual int id() const OVERRIDE; virtual void setOpacityFromAnimation(float) OVERRIDE; virtual float opacity() const OVERRIDE; @@ -78,14 +78,14 @@ private: WebKit::WebTransformationMatrix m_transform; }; -void addOpacityTransitionToController(cc::LayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); -void addAnimatedTransformToController(cc::LayerAnimationController&, double duration, int deltaX, int deltaY); +void addOpacityTransitionToController(cc::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); +void addAnimatedTransformToController(cc::CCLayerAnimationController&, double duration, int deltaX, int deltaY); -void addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); -void addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); +void addOpacityTransitionToLayer(cc::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); +void addOpacityTransitionToLayer(cc::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); -void addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int deltaY); -void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY); +void addAnimatedTransformToLayer(cc::LayerChromium&, double duration, int deltaX, int deltaY); +void addAnimatedTransformToLayer(cc::CCLayerImpl&, double duration, int deltaX, int deltaY); } // namespace WebKitTests |