| Index: cc/raster/gpu_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
|
| index c1f82d1b16f88b48799801aed1b27d03f1709d2e..a79d8054b2d8a09d496f0938f33ceb3d12d726cd 100644
|
| --- a/cc/raster/gpu_tile_task_worker_pool.cc
|
| +++ b/cc/raster/gpu_tile_task_worker_pool.cc
|
| @@ -90,66 +90,36 @@ class RasterBufferImpl : public RasterBuffer {
|
|
|
| // static
|
| std::unique_ptr<TileTaskWorkerPool> GpuTileTaskWorkerPool::Create(
|
| - base::SequencedTaskRunner* task_runner,
|
| - TaskGraphRunner* task_graph_runner,
|
| ContextProvider* context_provider,
|
| ResourceProvider* resource_provider,
|
| bool use_distance_field_text,
|
| int gpu_rasterization_msaa_sample_count) {
|
| return base::WrapUnique<TileTaskWorkerPool>(new GpuTileTaskWorkerPool(
|
| - task_runner, task_graph_runner, context_provider, resource_provider,
|
| - use_distance_field_text, gpu_rasterization_msaa_sample_count));
|
| + context_provider, resource_provider, use_distance_field_text,
|
| + gpu_rasterization_msaa_sample_count));
|
| }
|
|
|
| GpuTileTaskWorkerPool::GpuTileTaskWorkerPool(
|
| - base::SequencedTaskRunner* task_runner,
|
| - TaskGraphRunner* task_graph_runner,
|
| ContextProvider* context_provider,
|
| ResourceProvider* resource_provider,
|
| bool use_distance_field_text,
|
| int gpu_rasterization_msaa_sample_count)
|
| - : task_runner_(task_runner),
|
| - task_graph_runner_(task_graph_runner),
|
| - namespace_token_(task_graph_runner_->GetNamespaceToken()),
|
| - rasterizer_(new GpuRasterizer(context_provider,
|
| + : rasterizer_(new GpuRasterizer(context_provider,
|
| resource_provider,
|
| use_distance_field_text,
|
| gpu_rasterization_msaa_sample_count)) {}
|
|
|
| GpuTileTaskWorkerPool::~GpuTileTaskWorkerPool() {
|
| - DCHECK_EQ(0u, completed_tasks_.size());
|
| }
|
|
|
| -void GpuTileTaskWorkerPool::Shutdown() {
|
| - TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::Shutdown");
|
| +void GpuTileTaskWorkerPool::BarrierToSyncResources() {
|
| + TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::BarrierToSyncResources");
|
|
|
| - TaskGraph empty;
|
| - task_graph_runner_->ScheduleTasks(namespace_token_, &empty);
|
| - task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
|
| -}
|
| -
|
| -void GpuTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| - TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::ScheduleTasks");
|
| -
|
| - ScheduleTasksOnOriginThread(this, graph);
|
| -
|
| - // Barrier to sync any new resources to the worker context.
|
| rasterizer_->resource_provider()
|
| ->output_surface()
|
| ->context_provider()
|
| ->ContextGL()
|
| ->OrderingBarrierCHROMIUM();
|
| -
|
| - task_graph_runner_->ScheduleTasks(namespace_token_, graph);
|
| -}
|
| -
|
| -void GpuTileTaskWorkerPool::CheckForCompletedTasks() {
|
| - TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::CheckForCompletedTasks");
|
| -
|
| - task_graph_runner_->CollectCompletedTasks(namespace_token_,
|
| - &completed_tasks_);
|
| - CompleteTasks(completed_tasks_);
|
| - completed_tasks_.clear();
|
| }
|
|
|
| ResourceFormat GpuTileTaskWorkerPool::GetResourceFormat(
|
| @@ -167,17 +137,6 @@ RasterBufferProvider* GpuTileTaskWorkerPool::AsRasterBufferProvider() {
|
| return this;
|
| }
|
|
|
| -void GpuTileTaskWorkerPool::CompleteTasks(const Task::Vector& tasks) {
|
| - for (auto& task : tasks) {
|
| - TileTask* tile_task = static_cast<TileTask*>(task.get());
|
| -
|
| - tile_task->WillComplete();
|
| - tile_task->CompleteOnOriginThread(this);
|
| - tile_task->DidComplete();
|
| - }
|
| - completed_tasks_.clear();
|
| -}
|
| -
|
| std::unique_ptr<RasterBuffer> GpuTileTaskWorkerPool::AcquireBufferForRaster(
|
| const Resource* resource,
|
| uint64_t resource_content_id,
|
|
|