| 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/timing_function.h" | 9 #include "cc/animation/timing_function.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 } | 97 } |
| 98 EndTest(); | 98 EndTest(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 virtual void AfterTest() OVERRIDE {} | 101 virtual void AfterTest() OVERRIDE {} |
| 102 | 102 |
| 103 private: | 103 private: |
| 104 int num_animates_; | 104 int num_animates_; |
| 105 }; | 105 }; |
| 106 | 106 |
| 107 // Temporarily suppressed per crbug.com/280706. | 107 MULTI_THREAD_TEST_F( |
| 108 //MULTI_THREAD_TEST_F( | 108 LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback); |
| 109 // LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback); | |
| 110 | 109 |
| 111 // Add a layer animation and confirm that | 110 // Add a layer animation and confirm that |
| 112 // LayerTreeHostImpl::updateAnimationState does get called and continues to | 111 // LayerTreeHostImpl::updateAnimationState does get called and continues to |
| 113 // get called. | 112 // get called. |
| 114 class LayerTreeHostAnimationTestAddAnimation | 113 class LayerTreeHostAnimationTestAddAnimation |
| 115 : public LayerTreeHostAnimationTest { | 114 : public LayerTreeHostAnimationTest { |
| 116 public: | 115 public: |
| 117 LayerTreeHostAnimationTestAddAnimation() | 116 LayerTreeHostAnimationTestAddAnimation() |
| 118 : num_animates_(0), | 117 : num_animates_(0), |
| 119 received_animation_started_notification_(false), | 118 received_animation_started_notification_(false), |
| (...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 int finished_times_; | 797 int finished_times_; |
| 799 FakeContentLayerClient client_; | 798 FakeContentLayerClient client_; |
| 800 scoped_refptr<FakeContentLayer> content_; | 799 scoped_refptr<FakeContentLayer> content_; |
| 801 }; | 800 }; |
| 802 | 801 |
| 803 MULTI_THREAD_TEST_F( | 802 MULTI_THREAD_TEST_F( |
| 804 LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations); | 803 LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations); |
| 805 | 804 |
| 806 } // namespace | 805 } // namespace |
| 807 } // namespace cc | 806 } // namespace cc |
| OLD | NEW |