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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 } | 530 } |
531 | 531 |
532 virtual void AfterTest() OVERRIDE { | 532 virtual void AfterTest() OVERRIDE { |
533 EXPECT_EQ(3, animated_commit_); | 533 EXPECT_EQ(3, animated_commit_); |
534 } | 534 } |
535 | 535 |
536 private: | 536 private: |
537 int animated_commit_; | 537 int animated_commit_; |
538 }; | 538 }; |
539 | 539 |
540 MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount); | 540 // No readbacks with a delegating renderer. |
| 541 MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 542 LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount); |
541 | 543 |
542 class LayerTreeHostAnimationTestContinuousAnimate | 544 class LayerTreeHostAnimationTestContinuousAnimate |
543 : public LayerTreeHostAnimationTest { | 545 : public LayerTreeHostAnimationTest { |
544 public: | 546 public: |
545 LayerTreeHostAnimationTestContinuousAnimate() | 547 LayerTreeHostAnimationTestContinuousAnimate() |
546 : num_commit_complete_(0), | 548 : num_commit_complete_(0), |
547 num_draw_layers_(0) { | 549 num_draw_layers_(0) { |
548 } | 550 } |
549 | 551 |
550 virtual void BeginTest() OVERRIDE { | 552 virtual void BeginTest() OVERRIDE { |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
821 FakeContentLayerClient client_; | 823 FakeContentLayerClient client_; |
822 scoped_refptr<FakeContentLayer> root_layer_; | 824 scoped_refptr<FakeContentLayer> root_layer_; |
823 int started_times_; | 825 int started_times_; |
824 int num_commit_complete_; | 826 int num_commit_complete_; |
825 }; | 827 }; |
826 | 828 |
827 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestPinchZoomScrollbars); | 829 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostAnimationTestPinchZoomScrollbars); |
828 | 830 |
829 } // namespace | 831 } // namespace |
830 } // namespace cc | 832 } // namespace cc |
OLD | NEW |