| Index: content/renderer/raster_worker_pool.cc
|
| diff --git a/content/renderer/raster_worker_pool.cc b/content/renderer/raster_worker_pool.cc
|
| index 65c0014082744a7711a9588b0f1aeaf79cdc8ad5..d316474b5f6affd6ae142494733595e96aa6ef39 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()
|
| @@ -195,8 +195,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();
|
| @@ -312,7 +313,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");
|
|
|
| @@ -324,7 +325,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);
|
| }
|
| @@ -347,7 +348,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();
|
|
|