Index: content/renderer/raster_worker_pool.cc |
diff --git a/content/renderer/raster_worker_pool.cc b/content/renderer/raster_worker_pool.cc |
index e8ed13bf8cad0012e91abc13f9b2d6d3b23b117a..0c73b4542351a6e84ab4b7033792f9a2195ea6b6 100644 |
--- a/content/renderer/raster_worker_pool.cc |
+++ b/content/renderer/raster_worker_pool.cc |
@@ -109,12 +109,12 @@ class RasterWorkerPool::RasterWorkerPoolSequencedTaskRunner |
// Namespace used to schedule tasks in the task graph runner. |
cc::NamespaceToken namespace_token_; |
// List of tasks currently queued up for execution. |
- cc::Task::Vector tasks_; |
+ cc::DependencyTask::Vector tasks_; |
// Graph object used for scheduling tasks. |
cc::TaskGraph graph_; |
// Cached vector to avoid allocation when getting the list of complete |
// tasks. |
- cc::Task::Vector completed_tasks_; |
+ cc::DependencyTask::Vector completed_tasks_; |
}; |
RasterWorkerPool::RasterWorkerPool() |
@@ -198,8 +198,9 @@ bool RasterWorkerPool::PostDelayedTask( |
DCHECK(completed_tasks_.empty()); |
CollectCompletedTasksWithLockAcquired(namespace_token_, &completed_tasks_); |
- cc::Task::Vector::iterator end = std::remove_if( |
- tasks_.begin(), tasks_.end(), [this](const scoped_refptr<cc::Task>& e) { |
+ cc::DependencyTask::Vector::iterator end = std::remove_if( |
+ tasks_.begin(), tasks_.end(), |
+ [this](const scoped_refptr<cc::DependencyTask>& e) { |
return std::find(this->completed_tasks_.begin(), |
this->completed_tasks_.end(), |
e) != this->completed_tasks_.end(); |
@@ -315,7 +316,7 @@ void RasterWorkerPool::WaitForTasksToFinishRunning(cc::NamespaceToken token) { |
void RasterWorkerPool::CollectCompletedTasks( |
cc::NamespaceToken token, |
- cc::Task::Vector* completed_tasks) { |
+ cc::DependencyTask::Vector* completed_tasks) { |
TRACE_EVENT0("disabled-by-default-cc.debug", |
"RasterWorkerPool::CollectCompletedTasks"); |
@@ -327,7 +328,7 @@ void RasterWorkerPool::CollectCompletedTasks( |
void RasterWorkerPool::CollectCompletedTasksWithLockAcquired( |
cc::NamespaceToken token, |
- cc::Task::Vector* completed_tasks) { |
+ cc::DependencyTask::Vector* completed_tasks) { |
DCHECK(token.IsValid()); |
work_queue_.CollectCompletedTasks(token, completed_tasks); |
} |
@@ -350,7 +351,7 @@ void RasterWorkerPool::RunTaskInCategoryWithLockAcquired( |
lock_.AssertAcquired(); |
auto prioritized_task = work_queue_.GetNextTaskToRun(category); |
- cc::Task* task = prioritized_task.task; |
+ cc::DependencyTask* task = prioritized_task.task; |
// There may be more work available, so wake up another worker thread. |
SignalHasReadyToRunTasksWithLockAcquired(); |