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 d271ba3a12ef18b01ea777428577083308b8ecbe..479021eb0544c09d4a6efdf4899d2b408181394f 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -65,6 +65,7 @@ |
#include "cc/quads/texture_draw_quad.h" |
#include "cc/raster/bitmap_raster_buffer_provider.h" |
#include "cc/raster/gpu_raster_buffer_provider.h" |
+#include "cc/raster/gpu_rasterizer.h" |
#include "cc/raster/one_copy_raster_buffer_provider.h" |
#include "cc/raster/raster_buffer_provider.h" |
#include "cc/raster/synchronous_task_graph_runner.h" |
@@ -2179,7 +2180,8 @@ |
} |
void LayerTreeHostImpl::CreateTileManagerResources() { |
- CreateResourceAndRasterBufferProvider(&raster_buffer_provider_, |
+ std::unique_ptr<RasterBufferProvider> raster_buffer_provider; |
+ CreateResourceAndRasterBufferProvider(&raster_buffer_provider, |
&resource_pool_); |
if (use_gpu_rasterization_) { |
@@ -2204,12 +2206,13 @@ |
task_graph_runner = single_thread_synchronous_task_graph_runner_.get(); |
} |
- tile_task_manager_ = TileTaskManagerImpl::Create(task_graph_runner); |
+ tile_task_manager_ = TileTaskManagerImpl::Create( |
+ std::move(raster_buffer_provider), task_graph_runner); |
// TODO(vmpstr): Initialize tile task limit at ctor time. |
tile_manager_.SetResources( |
resource_pool_.get(), image_decode_controller_.get(), |
- tile_task_manager_.get(), raster_buffer_provider_.get(), |
+ tile_task_manager_.get(), |
is_synchronous_single_threaded_ ? std::numeric_limits<size_t>::max() |
: settings_.scheduled_raster_task_limit, |
use_gpu_rasterization_); |
@@ -2248,7 +2251,7 @@ |
*raster_buffer_provider = base::MakeUnique<GpuRasterBufferProvider>( |
compositor_context_provider, worker_context_provider, |
resource_provider_.get(), settings_.use_distance_field_text, |
- msaa_sample_count, settings_.async_worker_context_enabled); |
+ msaa_sample_count); |
return; |
} |
@@ -2284,8 +2287,7 @@ |
GetTaskRunner(), compositor_context_provider, worker_context_provider, |
resource_provider_.get(), max_copy_texture_chromium_size, |
settings_.use_partial_raster, settings_.max_staging_buffer_usage_in_bytes, |
- settings_.renderer_settings.preferred_tile_format, |
- settings_.async_worker_context_enabled); |
+ settings_.renderer_settings.preferred_tile_format); |
} |
void LayerTreeHostImpl::SetLayerTreeMutator( |