| 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 "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 LayerTreeHostImplClient* host_impl_client, | 110 LayerTreeHostImplClient* host_impl_client, |
| 111 TaskRunnerProvider* task_runner_provider, | 111 TaskRunnerProvider* task_runner_provider, |
| 112 TaskGraphRunner* task_graph_runner, | 112 TaskGraphRunner* task_graph_runner, |
| 113 RenderingStatsInstrumentation* stats_instrumentation) | 113 RenderingStatsInstrumentation* stats_instrumentation) |
| 114 : LayerTreeHostImpl(settings, | 114 : LayerTreeHostImpl(settings, |
| 115 host_impl_client, | 115 host_impl_client, |
| 116 task_runner_provider, | 116 task_runner_provider, |
| 117 stats_instrumentation, | 117 stats_instrumentation, |
| 118 task_graph_runner, | 118 task_graph_runner, |
| 119 AnimationHost::CreateForTesting(ThreadInstance::IMPL), | 119 AnimationHost::CreateForTesting(ThreadInstance::IMPL), |
| 120 0, | 120 0), |
| 121 nullptr), | |
| 122 test_hooks_(test_hooks), | 121 test_hooks_(test_hooks), |
| 123 block_notify_ready_to_activate_for_testing_(false), | 122 block_notify_ready_to_activate_for_testing_(false), |
| 124 notify_ready_to_activate_was_blocked_(false) {} | 123 notify_ready_to_activate_was_blocked_(false) {} |
| 125 | 124 |
| 126 void CreateResourceAndRasterBufferProvider( | 125 void CreateResourceAndRasterBufferProvider( |
| 127 std::unique_ptr<RasterBufferProvider>* raster_buffer_provider, | 126 std::unique_ptr<RasterBufferProvider>* raster_buffer_provider, |
| 128 std::unique_ptr<ResourcePool>* resource_pool) override { | 127 std::unique_ptr<ResourcePool>* resource_pool) override { |
| 129 test_hooks_->CreateResourceAndRasterBufferProvider( | 128 test_hooks_->CreateResourceAndRasterBufferProvider( |
| 130 this, raster_buffer_provider, resource_pool); | 129 this, raster_buffer_provider, resource_pool); |
| 131 } | 130 } |
| (...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 923 DCHECK(!IsRemoteTest()); | 922 DCHECK(!IsRemoteTest()); |
| 924 return layer_tree_host_in_process_; | 923 return layer_tree_host_in_process_; |
| 925 } | 924 } |
| 926 | 925 |
| 927 Proxy* LayerTreeTest::proxy() { | 926 Proxy* LayerTreeTest::proxy() { |
| 928 return layer_tree_host_in_process() ? layer_tree_host_in_process()->proxy() | 927 return layer_tree_host_in_process() ? layer_tree_host_in_process()->proxy() |
| 929 : NULL; | 928 : NULL; |
| 930 } | 929 } |
| 931 | 930 |
| 932 } // namespace cc | 931 } // namespace cc |
| OLD | NEW |