| 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 a54be78ba223f7cfc245d3776824596b87b55fdd..a29b9a536757b2e3270ce2172b252a84f797254d 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -60,7 +60,6 @@
|
| #include "cc/resources/prioritized_resource_manager.h"
|
| #include "cc/resources/raster_tile_priority_queue.h"
|
| #include "cc/resources/resource_pool.h"
|
| -#include "cc/resources/software_rasterizer.h"
|
| #include "cc/resources/texture_mailbox_deleter.h"
|
| #include "cc/resources/tile_task_worker_pool.h"
|
| #include "cc/resources/ui_resource_bitmap.h"
|
| @@ -2003,7 +2002,6 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
|
| DCHECK(output_surface_);
|
| DCHECK(resource_provider_);
|
|
|
| - rasterizer_ = CreateRasterizer();
|
| CreateResourceAndTileTaskWorkerPool(&tile_task_worker_pool_, &resource_pool_,
|
| &staging_resource_pool_);
|
| DCHECK(tile_task_worker_pool_);
|
| @@ -2016,25 +2014,13 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
|
| size_t scheduled_raster_task_limit =
|
| IsSynchronousSingleThreaded() ? std::numeric_limits<size_t>::max()
|
| : settings_.scheduled_raster_task_limit;
|
| - tile_manager_ =
|
| - TileManager::Create(this, task_runner, resource_pool_.get(),
|
| - tile_task_worker_pool_->AsTileTaskRunner(),
|
| - rasterizer_.get(), scheduled_raster_task_limit);
|
| + tile_manager_ = TileManager::Create(
|
| + this, task_runner, resource_pool_.get(),
|
| + tile_task_worker_pool_->AsTileTaskRunner(), scheduled_raster_task_limit);
|
|
|
| UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
|
| }
|
|
|
| -scoped_ptr<Rasterizer> LayerTreeHostImpl::CreateRasterizer() {
|
| - ContextProvider* context_provider = output_surface_->context_provider();
|
| - if (use_gpu_rasterization_ && context_provider) {
|
| - return GpuRasterizer::Create(context_provider, resource_provider_.get(),
|
| - settings_.use_distance_field_text,
|
| - settings_.threaded_gpu_rasterization_enabled,
|
| - settings_.gpu_rasterization_msaa_sample_count);
|
| - }
|
| - return SoftwareRasterizer::Create();
|
| -}
|
| -
|
| void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool,
|
| scoped_ptr<ResourcePool>* resource_pool,
|
| @@ -2068,8 +2054,9 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
|
| - task_runner, task_graph_runner,
|
| - static_cast<GpuRasterizer*>(rasterizer_.get()));
|
| + task_runner, task_graph_runner, context_provider,
|
| + resource_provider_.get(), settings_.use_distance_field_text,
|
| + settings_.gpu_rasterization_msaa_sample_count);
|
| return;
|
| }
|
|
|
| @@ -2139,7 +2126,6 @@ void LayerTreeHostImpl::DestroyTileManager() {
|
| resource_pool_ = nullptr;
|
| staging_resource_pool_ = nullptr;
|
| tile_task_worker_pool_ = nullptr;
|
| - rasterizer_ = nullptr;
|
| single_thread_synchronous_task_graph_runner_ = nullptr;
|
| }
|
|
|
|
|