| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index e66a3906e17db7d3124377331a65b3a661aa3ad5..2417d9de2ab304adc93e4c765e0cc04a8b9774b4 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -169,14 +169,11 @@ scoped_ptr<LayerTreeHostImpl> LayerTreeHostImpl::Create(
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation,
|
| SharedBitmapManager* shared_bitmap_manager,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| + TaskGraphRunner* task_graph_runner,
|
| int id) {
|
| - return make_scoped_ptr(new LayerTreeHostImpl(settings,
|
| - client,
|
| - proxy,
|
| - rendering_stats_instrumentation,
|
| - shared_bitmap_manager,
|
| - gpu_memory_buffer_manager,
|
| - id));
|
| + return make_scoped_ptr(new LayerTreeHostImpl(
|
| + settings, client, proxy, rendering_stats_instrumentation,
|
| + shared_bitmap_manager, gpu_memory_buffer_manager, task_graph_runner, id));
|
| }
|
|
|
| LayerTreeHostImpl::LayerTreeHostImpl(
|
| @@ -186,6 +183,7 @@ LayerTreeHostImpl::LayerTreeHostImpl(
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation,
|
| SharedBitmapManager* shared_bitmap_manager,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| + TaskGraphRunner* task_graph_runner,
|
| int id)
|
| : client_(client),
|
| proxy_(proxy),
|
| @@ -224,6 +222,7 @@ LayerTreeHostImpl::LayerTreeHostImpl(
|
| micro_benchmark_controller_(this),
|
| shared_bitmap_manager_(shared_bitmap_manager),
|
| gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
|
| + task_graph_runner_(task_graph_runner),
|
| id_(id),
|
| requires_high_res_to_draw_(false),
|
| is_likely_to_require_a_draw_(false),
|
| @@ -2031,8 +2030,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
|
| - task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| - resource_provider_.get());
|
| + task_runner, task_graph_runner_, resource_provider_.get());
|
| return;
|
| }
|
|
|
| @@ -2041,7 +2039,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
|
| - task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| + task_runner, task_graph_runner_,
|
| static_cast<GpuRasterizer*>(rasterizer_.get()));
|
| return;
|
| }
|
| @@ -2065,7 +2063,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| single_thread_synchronous_task_graph_runner_.reset(new TaskGraphRunner);
|
| task_graph_runner = single_thread_synchronous_task_graph_runner_.get();
|
| } else {
|
| - task_graph_runner = TileTaskWorkerPool::GetTaskGraphRunner();
|
| + task_graph_runner = task_graph_runner_;
|
| }
|
|
|
| *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
|
| @@ -2081,9 +2079,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
|
| - task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| - context_provider, resource_provider_.get(),
|
| - staging_resource_pool_.get());
|
| + task_runner, task_graph_runner_, context_provider,
|
| + resource_provider_.get(), staging_resource_pool_.get());
|
| return;
|
| }
|
| }
|
| @@ -2097,7 +2094,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
|
| - task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider,
|
| + task_runner, task_graph_runner_, context_provider,
|
| resource_provider_.get(),
|
| GetMaxTransferBufferUsageBytes(context_provider->ContextCapabilities(),
|
| settings_.renderer_settings.refresh_rate));
|
|
|