| Index: cc/raster/zero_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| index e423450baf3e1ddc8cb21211a899b0263429837d..a13699383a938a2033782f8c29f43a1fa80650ba 100644
|
| --- a/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
|
| @@ -66,59 +66,22 @@ class RasterBufferImpl : public RasterBuffer {
|
|
|
| // static
|
| std::unique_ptr<TileTaskWorkerPool> ZeroCopyTileTaskWorkerPool::Create(
|
| - base::SequencedTaskRunner* task_runner,
|
| - TaskGraphRunner* task_graph_runner,
|
| ResourceProvider* resource_provider,
|
| ResourceFormat preferred_tile_format) {
|
| return base::WrapUnique<TileTaskWorkerPool>(
|
| - new ZeroCopyTileTaskWorkerPool(task_runner, task_graph_runner,
|
| - resource_provider, preferred_tile_format));
|
| + new ZeroCopyTileTaskWorkerPool(resource_provider, preferred_tile_format));
|
| }
|
|
|
| ZeroCopyTileTaskWorkerPool::ZeroCopyTileTaskWorkerPool(
|
| - base::SequencedTaskRunner* task_runner,
|
| - TaskGraphRunner* task_graph_runner,
|
| ResourceProvider* resource_provider,
|
| ResourceFormat preferred_tile_format)
|
| - : task_runner_(task_runner),
|
| - task_graph_runner_(task_graph_runner),
|
| - namespace_token_(task_graph_runner->GetNamespaceToken()),
|
| - resource_provider_(resource_provider),
|
| + : resource_provider_(resource_provider),
|
| preferred_tile_format_(preferred_tile_format) {}
|
|
|
| ZeroCopyTileTaskWorkerPool::~ZeroCopyTileTaskWorkerPool() {
|
| }
|
|
|
| -void ZeroCopyTileTaskWorkerPool::Shutdown() {
|
| - TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::Shutdown");
|
| -
|
| - TaskGraph empty;
|
| - task_graph_runner_->ScheduleTasks(namespace_token_, &empty);
|
| - task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
|
| -}
|
| -
|
| -void ZeroCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| - TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::ScheduleTasks");
|
| -
|
| - ScheduleTasksOnOriginThread(this, graph);
|
| - task_graph_runner_->ScheduleTasks(namespace_token_, graph);
|
| -}
|
| -
|
| -void ZeroCopyTileTaskWorkerPool::CheckForCompletedTasks() {
|
| - TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::CheckForCompletedTasks");
|
| -
|
| - task_graph_runner_->CollectCompletedTasks(namespace_token_,
|
| - &completed_tasks_);
|
| - for (Task::Vector::const_iterator it = completed_tasks_.begin();
|
| - it != completed_tasks_.end(); ++it) {
|
| - TileTask* task = static_cast<TileTask*>(it->get());
|
| -
|
| - task->WillComplete();
|
| - task->CompleteOnOriginThread(this);
|
| - task->DidComplete();
|
| - }
|
| - completed_tasks_.clear();
|
| -}
|
| +void ZeroCopyTileTaskWorkerPool::BarrierToSyncResources() {}
|
|
|
| ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat(
|
| bool must_support_alpha) const {
|
|
|