Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1275)

Unified Diff: cc/test/animation_test_common.h

Issue 12854010: cc: Chromify animation_test_common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated variable naming style for function args in the .cc Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/animation_test_common.h
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index c4bbe1581a1f8d55ef5b0648eaeee10bce31c85e..7d4535a531f63189ffb2332ac832f770506e8e62 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -18,75 +18,96 @@ class Layer;
namespace cc {
class FakeFloatAnimationCurve : public cc::FloatAnimationCurve {
-public:
- FakeFloatAnimationCurve();
- explicit FakeFloatAnimationCurve(double duration);
- virtual ~FakeFloatAnimationCurve();
+ public:
+ FakeFloatAnimationCurve();
+ explicit FakeFloatAnimationCurve(double duration);
+ virtual ~FakeFloatAnimationCurve();
- virtual double Duration() const OVERRIDE;
- virtual float GetValue(double now) const OVERRIDE;
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
+ virtual double Duration() const OVERRIDE;
+ virtual float GetValue(double now) const OVERRIDE;
+ virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
-private:
- double m_duration;
+ private:
+ double duration_;
};
class FakeTransformTransition : public cc::TransformAnimationCurve {
-public:
- FakeTransformTransition(double duration);
- virtual ~FakeTransformTransition();
+ public:
+ FakeTransformTransition(double duration);
+ virtual ~FakeTransformTransition();
- virtual double Duration() const OVERRIDE;
- virtual gfx::Transform GetValue(double time) const OVERRIDE;
+ virtual double Duration() const OVERRIDE;
+ virtual gfx::Transform GetValue(double time) const OVERRIDE;
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
+ virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
-private:
- double m_duration;
+ private:
+ double duration_;
};
class FakeFloatTransition : public cc::FloatAnimationCurve {
-public:
- FakeFloatTransition(double duration, float from, float to);
- virtual ~FakeFloatTransition();
+ public:
+ FakeFloatTransition(double duration, float from, float to);
+ virtual ~FakeFloatTransition();
- virtual double Duration() const OVERRIDE;
- virtual float GetValue(double time) const OVERRIDE;
+ virtual double Duration() const OVERRIDE;
+ virtual float GetValue(double time) const OVERRIDE;
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
+ virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE;
-private:
- double m_duration;
- float m_from;
- float m_to;
+ private:
+ double duration_;
+ float from_;
+ float to_;
};
class FakeLayerAnimationValueObserver : public cc::LayerAnimationValueObserver {
-public:
- FakeLayerAnimationValueObserver();
- virtual ~FakeLayerAnimationValueObserver();
+ public:
+ FakeLayerAnimationValueObserver();
+ virtual ~FakeLayerAnimationValueObserver();
- // LayerAnimationValueObserver implementation
- virtual void OnOpacityAnimated(float) OVERRIDE;
- virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE;
- virtual bool IsActive() const OVERRIDE;
+ // LayerAnimationValueObserver implementation
+ virtual void OnOpacityAnimated(float FIXMENAME) OVERRIDE;
danakj 2013/03/20 23:16:36 fixmenames
+ virtual void OnTransformAnimated(const gfx::Transform& FIXMENAME) OVERRIDE;
+ virtual bool IsActive() const OVERRIDE;
- float opacity() const { return m_opacity; }
- const gfx::Transform& transform() const { return m_transform; }
+ float opacity() const { return opacity_; }
+ const gfx::Transform& transform() const { return transform_; }
-private:
- float m_opacity;
- gfx::Transform m_transform;
+ private:
+ float opacity_;
+ gfx::Transform transform_;
};
-int addOpacityTransitionToController(cc::LayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-int addAnimatedTransformToController(cc::LayerAnimationController&, double duration, int deltaX, int deltaY);
-
-int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-
-int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int deltaY);
-int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY);
+int AddOpacityTransitionToController(cc::LayerAnimationController& FIXMENAME,
danakj 2013/03/20 23:16:36 and more
+ double duration,
+ float start_opacity,
+ float end_opacity,
+ bool use_timing_function);
+int AddAnimatedTransformToController(cc::LayerAnimationController& FIXMENAME,
danakj 2013/03/20 23:16:36 also non-const ref's should be turned into pointer
+ double duration,
+ int delta_x,
+ int delta_y);
+
+int AddOpacityTransitionToLayer(cc::Layer& FIXMENAME,
danakj 2013/03/20 23:16:36 also no need for cc::
+ double duration,
+ float start_opacity,
+ float end_opacity,
+ bool use_timing_function);
+int AddOpacityTransitionToLayer(cc::LayerImpl& FIXMENAME,
+ double duration,
+ float start_opacity,
+ float end_opacity,
+ bool use_timing_function);
+
+int AddAnimatedTransformToLayer(cc::Layer& FIXMENAME,
+ double duration,
+ int delta_x,
+ int delta_y);
+int AddAnimatedTransformToLayer(cc::LayerImpl& FIXMENAME,
+ double duration,
+ int delta_x,
+ int delta_y);
} // namespace cc
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698