OLD | NEW |
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 virtual void setOpacityFromAnimation(float) OVERRIDE; | 70 virtual void setOpacityFromAnimation(float) OVERRIDE; |
71 virtual float opacity() const OVERRIDE; | 71 virtual float opacity() const OVERRIDE; |
72 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix
&) OVERRIDE; | 72 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix
&) OVERRIDE; |
73 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE; | 73 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE; |
74 | 74 |
75 private: | 75 private: |
76 float m_opacity; | 76 float m_opacity; |
77 WebKit::WebTransformationMatrix m_transform; | 77 WebKit::WebTransformationMatrix m_transform; |
78 }; | 78 }; |
79 | 79 |
80 void addOpacityTransitionToController(cc::LayerAnimationController&, double dura
tion, float startOpacity, float endOpacity, bool useTimingFunction); | 80 int addOpacityTransitionToController(cc::LayerAnimationController&, double durat
ion, float startOpacity, float endOpacity, bool useTimingFunction); |
81 void addAnimatedTransformToController(cc::LayerAnimationController&, double dura
tion, int deltaX, int deltaY); | 81 int addAnimatedTransformToController(cc::LayerAnimationController&, double durat
ion, int deltaX, int deltaY); |
82 | 82 |
83 void addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity
, float endOpacity, bool useTimingFunction); | 83 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity,
float endOpacity, bool useTimingFunction); |
84 void addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpa
city, float endOpacity, bool useTimingFunction); | 84 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac
ity, float endOpacity, bool useTimingFunction); |
85 | 85 |
86 void addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int de
ltaY); | 86 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del
taY); |
87 void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, in
t deltaY); | 87 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int
deltaY); |
88 | 88 |
89 } // namespace WebKitTests | 89 } // namespace WebKitTests |
90 | 90 |
91 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ | 91 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ |
OLD | NEW |