| Index: cc/resources/image_copy_raster_worker_pool.cc
|
| diff --git a/cc/resources/image_copy_raster_worker_pool.cc b/cc/resources/image_copy_raster_worker_pool.cc
|
| index 8220f28dc5d1005ff8c4534aa9adf1adb87632bd..dda3b7c41ca46c065921ad1a029bf3e198261511 100644
|
| --- a/cc/resources/image_copy_raster_worker_pool.cc
|
| +++ b/cc/resources/image_copy_raster_worker_pool.cc
|
| @@ -70,12 +70,6 @@ void ImageCopyRasterWorkerPool::Shutdown() {
|
| void ImageCopyRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
| TRACE_EVENT0("cc", "ImageCopyRasterWorkerPool::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);
|
|
|
| @@ -90,13 +84,11 @@ void ImageCopyRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
| raster_finished_weak_ptr_factory_.InvalidateWeakPtrs();
|
|
|
| scoped_refptr<RasterizerTask>
|
| - new_raster_required_for_activation_finished_task(
|
| - CreateRasterRequiredForActivationFinishedTask(
|
| - queue->required_for_activation_count,
|
| - task_runner_.get(),
|
| - base::Bind(&ImageCopyRasterWorkerPool::
|
| - OnRasterRequiredForActivationFinished,
|
| - raster_finished_weak_ptr_factory_.GetWeakPtr())));
|
| + new_raster_required_for_activation_finished_task(CreateRasterFinishedTask(
|
| + task_runner_.get(),
|
| + base::Bind(
|
| + &ImageCopyRasterWorkerPool::OnRasterRequiredForActivationFinished,
|
| + raster_finished_weak_ptr_factory_.GetWeakPtr())));
|
| scoped_refptr<RasterizerTask> new_raster_finished_task(
|
| CreateRasterFinishedTask(
|
| task_runner_.get(),
|
| @@ -105,6 +97,8 @@ void ImageCopyRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
|
|
| resource_pool_->CheckBusyResources();
|
|
|
| + size_t required_for_activation_count = 0;
|
| +
|
| for (RasterTaskQueue::Item::Vector::const_iterator it = queue->items.begin();
|
| it != queue->items.end();
|
| ++it) {
|
| @@ -113,6 +107,7 @@ void ImageCopyRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
| DCHECK(!task->HasCompleted());
|
|
|
| if (item.required_for_activation) {
|
| + ++required_for_activation_count;
|
| graph_.edges.push_back(TaskGraph::Edge(
|
| task, new_raster_required_for_activation_finished_task.get()));
|
| }
|
| @@ -126,7 +121,7 @@ void ImageCopyRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
|
| InsertNodeForTask(&graph_,
|
| new_raster_required_for_activation_finished_task.get(),
|
| kRasterRequiredForActivationFinishedTaskPriority,
|
| - queue->required_for_activation_count);
|
| + required_for_activation_count);
|
| InsertNodeForTask(&graph_,
|
| new_raster_finished_task.get(),
|
| kRasterFinishedTaskPriority,
|
|
|