Index: cc/raster/one_copy_tile_task_worker_pool.cc |
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc |
index d8a3340a2187c7fc7d6aab80b764fd4be86eab91..5703c4d2e6626ee740804e1c788dfd9d4bef2f7b 100644 |
--- a/cc/raster/one_copy_tile_task_worker_pool.cc |
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc |
@@ -70,7 +70,6 @@ const int kMaxBytesPerCopyOperation = 1024 * 1024 * 4; |
// static |
std::unique_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create( |
base::SequencedTaskRunner* task_runner, |
- TaskGraphRunner* task_graph_runner, |
ContextProvider* context_provider, |
ResourceProvider* resource_provider, |
int max_copy_texture_chromium_size, |
@@ -78,22 +77,19 @@ std::unique_ptr<TileTaskWorkerPool> OneCopyTileTaskWorkerPool::Create( |
int max_staging_buffer_usage_in_bytes, |
ResourceFormat preferred_tile_format) { |
return base::WrapUnique<TileTaskWorkerPool>(new OneCopyTileTaskWorkerPool( |
- task_runner, task_graph_runner, resource_provider, |
- max_copy_texture_chromium_size, use_partial_raster, |
- max_staging_buffer_usage_in_bytes, preferred_tile_format)); |
+ task_runner, resource_provider, max_copy_texture_chromium_size, |
+ use_partial_raster, max_staging_buffer_usage_in_bytes, |
+ preferred_tile_format)); |
} |
OneCopyTileTaskWorkerPool::OneCopyTileTaskWorkerPool( |
base::SequencedTaskRunner* task_runner, |
- TaskGraphRunner* task_graph_runner, |
ResourceProvider* resource_provider, |
int max_copy_texture_chromium_size, |
bool use_partial_raster, |
int max_staging_buffer_usage_in_bytes, |
ResourceFormat preferred_tile_format) |
- : task_graph_runner_(task_graph_runner), |
- namespace_token_(task_graph_runner->GetNamespaceToken()), |
- resource_provider_(resource_provider), |
+ : resource_provider_(resource_provider), |
max_bytes_per_copy_operation_( |
max_copy_texture_chromium_size |
? std::min(kMaxBytesPerCopyOperation, |
@@ -110,45 +106,13 @@ OneCopyTileTaskWorkerPool::OneCopyTileTaskWorkerPool( |
OneCopyTileTaskWorkerPool::~OneCopyTileTaskWorkerPool() { |
} |
-void OneCopyTileTaskWorkerPool::Shutdown() { |
- TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::Shutdown"); |
+void OneCopyTileTaskWorkerPool::BarrierToSyncResources() { |
+ TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::BarrierToSyncResources"); |
- TaskGraph empty; |
- task_graph_runner_->ScheduleTasks(namespace_token_, &empty); |
- task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_); |
- |
- staging_pool_->Shutdown(); |
-} |
- |
-void OneCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) { |
- TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::ScheduleTasks"); |
- |
- ScheduleTasksOnOriginThread(this, graph); |
- |
- // Barrier to sync any new resources to the worker context. |
resource_provider_->output_surface() |
->context_provider() |
->ContextGL() |
->OrderingBarrierCHROMIUM(); |
- |
- task_graph_runner_->ScheduleTasks(namespace_token_, graph); |
-} |
- |
-void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() { |
- TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::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(); |
} |
ResourceFormat OneCopyTileTaskWorkerPool::GetResourceFormat( |