| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ | 5 #ifndef UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ |
| 6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ | 6 #define UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
| 10 #include "ui/compositor/layer_animation_delegate.h" | 10 #include "ui/compositor/layer_animation_delegate.h" |
| 11 #include "ui/compositor/layer_threaded_animation_delegate.h" | 11 #include "ui/compositor/layer_threaded_animation_delegate.h" |
| 12 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 13 #include "ui/gfx/transform.h" | 13 #include "ui/gfx/transform.h" |
| 14 | 14 |
| 15 namespace ui { | 15 namespace ui { |
| 16 | 16 |
| 17 class TestLayerThreadedAnimationDelegate | 17 class TestLayerThreadedAnimationDelegate |
| 18 : public LayerThreadedAnimationDelegate { | 18 : public LayerThreadedAnimationDelegate { |
| 19 public: | 19 public: |
| 20 TestLayerThreadedAnimationDelegate(); | 20 TestLayerThreadedAnimationDelegate(); |
| 21 ~TestLayerThreadedAnimationDelegate() override; | 21 ~TestLayerThreadedAnimationDelegate() override; |
| 22 | 22 |
| 23 // Implementation of LayerThreadedAnimationDelegate | 23 // Implementation of LayerThreadedAnimationDelegate |
| 24 void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) override; | 24 void AddThreadedAnimation(std::unique_ptr<cc::Animation> animation) override; |
| 25 void RemoveThreadedAnimation(int animation_id) override; | 25 void RemoveThreadedAnimation(int animation_id) override; |
| 26 }; | 26 }; |
| 27 | 27 |
| 28 class TestLayerAnimationDelegate : public LayerAnimationDelegate { | 28 class TestLayerAnimationDelegate : public LayerAnimationDelegate { |
| 29 public: | 29 public: |
| 30 TestLayerAnimationDelegate(); | 30 TestLayerAnimationDelegate(); |
| 31 explicit TestLayerAnimationDelegate(const LayerAnimationDelegate& other); | 31 explicit TestLayerAnimationDelegate(const LayerAnimationDelegate& other); |
| 32 TestLayerAnimationDelegate(const TestLayerAnimationDelegate& other); | 32 TestLayerAnimationDelegate(const TestLayerAnimationDelegate& other); |
| 33 ~TestLayerAnimationDelegate() override; | 33 ~TestLayerAnimationDelegate() override; |
| 34 | 34 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 float grayscale_; | 66 float grayscale_; |
| 67 SkColor color_; | 67 SkColor color_; |
| 68 scoped_refptr<cc::Layer> cc_layer_; | 68 scoped_refptr<cc::Layer> cc_layer_; |
| 69 | 69 |
| 70 // Allow copy and assign. | 70 // Allow copy and assign. |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 } // namespace ui | 73 } // namespace ui |
| 74 | 74 |
| 75 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ | 75 #endif // UI_COMPOSITOR_TEST_TEST_LAYER_ANIMATION_DELEGATE_H_ |
| OLD | NEW |