OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/test/layer_tree_test.h" | 5 #include "cc/test/layer_tree_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
747 | 747 |
748 main_task_runner_ = base::MessageLoopProxy::current(); | 748 main_task_runner_ = base::MessageLoopProxy::current(); |
749 | 749 |
750 delegating_renderer_ = delegating_renderer; | 750 delegating_renderer_ = delegating_renderer; |
751 | 751 |
752 // Spend less time waiting for BeginFrame because the output is | 752 // Spend less time waiting for BeginFrame because the output is |
753 // mocked out. | 753 // mocked out. |
754 settings_.renderer_settings.refresh_rate = 200.0; | 754 settings_.renderer_settings.refresh_rate = 200.0; |
755 settings_.background_animation_rate = 200.0; | 755 settings_.background_animation_rate = 200.0; |
756 settings_.impl_side_painting = impl_side_painting; | 756 settings_.impl_side_painting = impl_side_painting; |
| 757 settings_.verify_property_trees = true; |
757 InitializeSettings(&settings_); | 758 InitializeSettings(&settings_); |
758 | 759 |
759 main_task_runner_->PostTask( | 760 main_task_runner_->PostTask( |
760 FROM_HERE, | 761 FROM_HERE, |
761 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this))); | 762 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this))); |
762 | 763 |
763 if (timeout_seconds_) { | 764 if (timeout_seconds_) { |
764 timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this))); | 765 timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this))); |
765 main_task_runner_->PostDelayedTask( | 766 main_task_runner_->PostDelayedTask( |
766 FROM_HERE, | 767 FROM_HERE, |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
826 return -1; | 827 return -1; |
827 } | 828 } |
828 | 829 |
829 void LayerTreeTest::DestroyLayerTreeHost() { | 830 void LayerTreeTest::DestroyLayerTreeHost() { |
830 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 831 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
831 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 832 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
832 layer_tree_host_ = nullptr; | 833 layer_tree_host_ = nullptr; |
833 } | 834 } |
834 | 835 |
835 } // namespace cc | 836 } // namespace cc |
OLD | NEW |