| Index: cc/resources/image_raster_worker_pool.cc
|
| diff --git a/cc/resources/image_raster_worker_pool.cc b/cc/resources/image_raster_worker_pool.cc
|
| index 4f35e8119983e7abf2f8c154b3380ace78e48f25..06327f960c962554c36103fa3d8cafd2a2cd671f 100644
|
| --- a/cc/resources/image_raster_worker_pool.cc
|
| +++ b/cc/resources/image_raster_worker_pool.cc
|
| @@ -33,9 +33,15 @@ ImageRasterWorkerPool::ImageRasterWorkerPool(
|
|
|
| ImageRasterWorkerPool::~ImageRasterWorkerPool() {}
|
|
|
| -void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
|
| +void ImageRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
| TRACE_EVENT0("cc", "ImageRasterWorkerPool::ScheduleTasks");
|
|
|
| + DCHECK_EQ(queue->required_for_activation_count,
|
| + static_cast<size_t>(
|
| + std::count_if(queue->items.begin(),
|
| + queue->items.end(),
|
| + RasterTaskQueue::Item::IsRequiredForActivation)));
|
| +
|
| if (!raster_tasks_pending_)
|
| TRACE_EVENT_ASYNC_BEGIN0("cc", "ScheduledTasks", this);
|
|
|
| @@ -49,7 +55,7 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
|
| scoped_refptr<internal::WorkerPoolTask>
|
| new_raster_required_for_activation_finished_task(
|
| CreateRasterRequiredForActivationFinishedTask(
|
| - queue->required_for_activation_count()));
|
| + queue->required_for_activation_count));
|
| scoped_refptr<internal::WorkerPoolTask> new_raster_finished_task(
|
| CreateRasterFinishedTask());
|
|
|
| @@ -71,11 +77,11 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
|
| InsertNodeForTask(&graph_,
|
| new_raster_required_for_activation_finished_task.get(),
|
| kRasterRequiredForActivationFinishedTaskPriority,
|
| - queue->required_for_activation_count());
|
| + queue->required_for_activation_count);
|
| InsertNodeForTask(&graph_,
|
| new_raster_finished_task.get(),
|
| kRasterFinishedTaskPriority,
|
| - queue->count());
|
| + queue->items.size());
|
|
|
| raster_tasks_.Swap(queue);
|
|
|
|
|