| 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/animation.h" | 8 #include "cc/animation/animation.h" |
| 9 #include "cc/animation_curve.h" | 9 #include "cc/animation/animation_curve.h" |
| 10 #include "cc/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
| 11 #include "cc/layer_animation_value_observer.h" | 11 #include "cc/animation/layer_animation_value_observer.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 cc { | 18 namespace cc { |
| 19 | 19 |
| 20 class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { | 20 class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { |
| 21 public: | 21 public: |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity,
float endOpacity, bool useTimingFunction); | 85 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity,
float endOpacity, bool useTimingFunction); |
| 86 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac
ity, float endOpacity, bool useTimingFunction); | 86 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac
ity, float endOpacity, bool useTimingFunction); |
| 87 | 87 |
| 88 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del
taY); | 88 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del
taY); |
| 89 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int
deltaY); | 89 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int
deltaY); |
| 90 | 90 |
| 91 } // namespace cc | 91 } // namespace cc |
| 92 | 92 |
| 93 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ | 93 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ |
| OLD | NEW |