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

Side by Side Diff: cc/test/animation_test_common.h

Issue 11491003: Revert 171714 - Use an auxiliary list of animation controllers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/single_thread_proxy.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TEST_ANIMATION_TEST_COMMON_H_ 5 #ifndef CC_TEST_ANIMATION_TEST_COMMON_H_
6 #define CC_TEST_ANIMATION_TEST_COMMON_H_ 6 #define CC_TEST_ANIMATION_TEST_COMMON_H_
7 7
8 #include "cc/active_animation.h" 8 #include "cc/active_animation.h"
9 #include "cc/animation_curve.h" 9 #include "cc/animation_curve.h"
10 #include "cc/layer_animation_controller.h" 10 #include "cc/layer_animation_controller.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual float getValue(double time) const OVERRIDE; 53 virtual float getValue(double time) const OVERRIDE;
54 54
55 virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE; 55 virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE;
56 56
57 private: 57 private:
58 double m_duration; 58 double m_duration;
59 float m_from; 59 float m_from;
60 float m_to; 60 float m_to;
61 }; 61 };
62 62
63 class FakeLayerAnimationControllerClient : public cc::LayerAnimationControllerCl ient {
64 public:
65 FakeLayerAnimationControllerClient();
66 virtual ~FakeLayerAnimationControllerClient();
67
68 // LayerAnimationControllerClient implementation
69 virtual int id() const OVERRIDE;
70 virtual void setOpacityFromAnimation(float) OVERRIDE;
71 virtual float opacity() const OVERRIDE;
72 virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE;
73 virtual const gfx::Transform& transform() const OVERRIDE;
74
75 private:
76 float m_opacity;
77 gfx::Transform m_transform;
78 };
79
63 int addOpacityTransitionToController(cc::LayerAnimationController&, double durat ion, float startOpacity, float endOpacity, bool useTimingFunction); 80 int addOpacityTransitionToController(cc::LayerAnimationController&, double durat ion, float startOpacity, float endOpacity, bool useTimingFunction);
64 int addAnimatedTransformToController(cc::LayerAnimationController&, double durat ion, int deltaX, int deltaY); 81 int addAnimatedTransformToController(cc::LayerAnimationController&, double durat ion, int deltaX, int deltaY);
65 82
66 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); 83 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
67 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac ity, float endOpacity, bool useTimingFunction); 84 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac ity, float endOpacity, bool useTimingFunction);
68 85
69 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del taY); 86 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del taY);
70 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY); 87 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY);
71 88
72 } // namespace cc 89 } // namespace cc
73 90
74 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ 91 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_
OLDNEW
« no previous file with comments | « cc/single_thread_proxy.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698