| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 void ScheduledActionCommit() override { | 146 void ScheduledActionCommit() override { |
| 147 ThreadProxy::ScheduledActionCommit(); | 147 ThreadProxy::ScheduledActionCommit(); |
| 148 test_hooks_->ScheduledActionCommit(); | 148 test_hooks_->ScheduledActionCommit(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 void ScheduledActionBeginOutputSurfaceCreation() override { | 151 void ScheduledActionBeginOutputSurfaceCreation() override { |
| 152 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation(); | 152 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation(); |
| 153 test_hooks_->ScheduledActionBeginOutputSurfaceCreation(); | 153 test_hooks_->ScheduledActionBeginOutputSurfaceCreation(); |
| 154 } | 154 } |
| 155 | 155 |
| 156 void ScheduledActionManageTiles() override { | 156 void ScheduledActionPrepareTiles() override { |
| 157 ThreadProxy::ScheduledActionManageTiles(); | 157 ThreadProxy::ScheduledActionPrepareTiles(); |
| 158 test_hooks_->ScheduledActionManageTiles(); | 158 test_hooks_->ScheduledActionPrepareTiles(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 ThreadProxyForTest( | 161 ThreadProxyForTest( |
| 162 TestHooks* test_hooks, | 162 TestHooks* test_hooks, |
| 163 LayerTreeHost* host, | 163 LayerTreeHost* host, |
| 164 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, | 164 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
| 165 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, | 165 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, |
| 166 scoped_ptr<BeginFrameSource> external_begin_frame_source) | 166 scoped_ptr<BeginFrameSource> external_begin_frame_source) |
| 167 : ThreadProxy(host, main_task_runner, | 167 : ThreadProxy(host, main_task_runner, |
| 168 impl_task_runner, | 168 impl_task_runner, |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 return -1; | 829 return -1; |
| 830 } | 830 } |
| 831 | 831 |
| 832 void LayerTreeTest::DestroyLayerTreeHost() { | 832 void LayerTreeTest::DestroyLayerTreeHost() { |
| 833 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 833 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
| 834 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 834 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
| 835 layer_tree_host_ = nullptr; | 835 layer_tree_host_ = nullptr; |
| 836 } | 836 } |
| 837 | 837 |
| 838 } // namespace cc | 838 } // namespace cc |
| OLD | NEW |