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 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
600 LayerTreeHostAnimationTest::SetupTree(); | 600 LayerTreeHostAnimationTest::SetupTree(); |
601 content_ = FakeContentLayer::Create(layer_settings(), &client_); | 601 content_ = FakeContentLayer::Create(layer_settings(), &client_); |
602 content_->SetBounds(gfx::Size(4, 4)); | 602 content_->SetBounds(gfx::Size(4, 4)); |
603 content_->set_layer_animation_delegate(this); | 603 content_->set_layer_animation_delegate(this); |
604 layer_tree_host()->root_layer()->AddChild(content_); | 604 layer_tree_host()->root_layer()->AddChild(content_); |
605 } | 605 } |
606 | 606 |
607 void InitializeSettings(LayerTreeSettings* settings) override { | 607 void InitializeSettings(LayerTreeSettings* settings) override { |
608 // Make sure that drawing many times doesn't cause a checkerboarded | 608 // Make sure that drawing many times doesn't cause a checkerboarded |
609 // animation to start so we avoid flake in this test. | 609 // animation to start so we avoid flake in this test. |
610 settings->timeout_and_draw_when_animation_checkerboards = false; | 610 // TODO(brianderson): Figure out what to do to make this test not flaky. |
| 611 // settings->timeout_and_draw_when_animation_checkerboards = false; |
611 } | 612 } |
612 | 613 |
613 void BeginTest() override { | 614 void BeginTest() override { |
614 prevented_draw_ = 0; | 615 prevented_draw_ = 0; |
615 added_animations_ = 0; | 616 added_animations_ = 0; |
616 started_times_ = 0; | 617 started_times_ = 0; |
617 | 618 |
618 PostSetNeedsCommitToMainThread(); | 619 PostSetNeedsCommitToMainThread(); |
619 } | 620 } |
620 | 621 |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1037 private: | 1038 private: |
1038 scoped_refptr<Layer> content_; | 1039 scoped_refptr<Layer> content_; |
1039 int num_swap_buffers_; | 1040 int num_swap_buffers_; |
1040 }; | 1041 }; |
1041 | 1042 |
1042 SINGLE_AND_MULTI_THREAD_TEST_F( | 1043 SINGLE_AND_MULTI_THREAD_TEST_F( |
1043 LayerTreeHostAnimationTestAddAnimationAfterAnimating); | 1044 LayerTreeHostAnimationTestAddAnimationAfterAnimating); |
1044 | 1045 |
1045 } // namespace | 1046 } // namespace |
1046 } // namespace cc | 1047 } // namespace cc |
OLD | NEW |