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 CCAnimationTestCommon_h | 5 #ifndef CCAnimationTestCommon_h |
6 #define CCAnimationTestCommon_h | 6 #define CCAnimationTestCommon_h |
7 | 7 |
8 #include "CCActiveAnimation.h" | |
9 #include "CCAnimationCurve.h" | |
10 #include "IntSize.h" | 8 #include "IntSize.h" |
| 9 #include "cc/active_animation.h" |
| 10 #include "cc/animation_curve.h" |
11 #include "cc/layer_animation_controller.h" | 11 #include "cc/layer_animation_controller.h" |
12 | 12 |
13 namespace cc { | 13 namespace cc { |
14 class LayerImpl; | 14 class LayerImpl; |
15 class Layer; | 15 class Layer; |
16 } | 16 } |
17 | 17 |
18 namespace WebKitTests { | 18 namespace WebKitTests { |
19 | 19 |
20 class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { | 20 class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 83 |
84 void addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity
, float endOpacity, bool useTimingFunction); | 84 void addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity
, float endOpacity, bool useTimingFunction); |
85 void addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpa
city, float endOpacity, bool useTimingFunction); | 85 void addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpa
city, float endOpacity, bool useTimingFunction); |
86 | 86 |
87 void addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int de
ltaY); | 87 void addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int de
ltaY); |
88 void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, in
t deltaY); | 88 void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, in
t deltaY); |
89 | 89 |
90 } // namespace WebKitTests | 90 } // namespace WebKitTests |
91 | 91 |
92 #endif // CCAnimationTesctCommon_h | 92 #endif // CCAnimationTesctCommon_h |
OLD | NEW |