| 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 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_curve.h" | 7 #include "cc/animation/animation_curve.h" |
| 8 #include "cc/animation/layer_animation_controller.h" | 8 #include "cc/animation/layer_animation_controller.h" |
| 9 #include "cc/animation/scroll_offset_animation_curve.h" | 9 #include "cc/animation/scroll_offset_animation_curve.h" |
| 10 #include "cc/animation/timing_function.h" | 10 #include "cc/animation/timing_function.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 95 } |
| 96 EndTest(); | 96 EndTest(); |
| 97 } | 97 } |
| 98 | 98 |
| 99 void AfterTest() override {} | 99 void AfterTest() override {} |
| 100 | 100 |
| 101 private: | 101 private: |
| 102 int num_begin_frames_; | 102 int num_begin_frames_; |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 MULTI_THREAD_TEST_F( | 105 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 106 LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback); | 106 LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback); |
| 107 | 107 |
| 108 // Add a layer animation and confirm that | 108 // Add a layer animation and confirm that |
| 109 // LayerTreeHostImpl::UpdateAnimationState does get called. | 109 // LayerTreeHostImpl::UpdateAnimationState does get called. |
| 110 class LayerTreeHostAnimationTestAddAnimation | 110 class LayerTreeHostAnimationTestAddAnimation |
| 111 : public LayerTreeHostAnimationTest { | 111 : public LayerTreeHostAnimationTest { |
| 112 public: | 112 public: |
| 113 LayerTreeHostAnimationTestAddAnimation() | 113 LayerTreeHostAnimationTestAddAnimation() |
| 114 : update_animation_state_was_called_(false) {} | 114 : update_animation_state_was_called_(false) {} |
| 115 | 115 |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 private: | 985 private: |
| 986 scoped_refptr<Layer> content_; | 986 scoped_refptr<Layer> content_; |
| 987 int num_swap_buffers_; | 987 int num_swap_buffers_; |
| 988 }; | 988 }; |
| 989 | 989 |
| 990 SINGLE_AND_MULTI_THREAD_TEST_F( | 990 SINGLE_AND_MULTI_THREAD_TEST_F( |
| 991 LayerTreeHostAnimationTestAddAnimationAfterAnimating); | 991 LayerTreeHostAnimationTestAddAnimationAfterAnimating); |
| 992 | 992 |
| 993 } // namespace | 993 } // namespace |
| 994 } // namespace cc | 994 } // namespace cc |
| OLD | NEW |