cc: Remove cc:RasterRequiredForActivation synthetic delays.

cc/resources/gpu_raster_worker_pool.cc

Index: cc/resources/gpu_raster_worker_pool.cc
diff --git a/cc/resources/gpu_raster_worker_pool.cc b/cc/resources/gpu_raster_worker_pool.cc
index 36d62aad8a195ecdb2cad7f75df0f25d6fd48ee0..c04557b33f95fde71b0d769f1672b6669287f6b0 100644
--- a/cc/resources/gpu_raster_worker_pool.cc
+++ b/cc/resources/gpu_raster_worker_pool.cc
@@ -62,12 +62,6 @@ void GpuRasterWorkerPool::Shutdown() {
 void GpuRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
   TRACE_EVENT0("cc", "GpuRasterWorkerPool::ScheduleTasks");
 
-  DCHECK_EQ(queue->required_for_activation_count,
-            static_cast<size_t>(
-                std::count_if(queue->items.begin(),
-                              queue->items.end(),
-                              RasterTaskQueue::Item::IsRequiredForActivation)));
-
   raster_tasks_pending_ = true;
   raster_tasks_required_for_activation_pending_ = true;
 
@@ -79,19 +73,19 @@ void GpuRasterWorkerPool::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(
-                  &GpuRasterWorkerPool::OnRasterRequiredForActivationFinished,
-                  raster_finished_weak_ptr_factory_.GetWeakPtr())));
+      new_raster_required_for_activation_finished_task(CreateRasterFinishedTask(
+          task_runner_.get(),
+          base::Bind(
+              &GpuRasterWorkerPool::OnRasterRequiredForActivationFinished,
+              raster_finished_weak_ptr_factory_.GetWeakPtr())));
   scoped_refptr<RasterizerTask> new_raster_finished_task(
       CreateRasterFinishedTask(
           task_runner_.get(),
           base::Bind(&GpuRasterWorkerPool::OnRasterFinished,
                      raster_finished_weak_ptr_factory_.GetWeakPtr())));
 
+  size_t required_for_activation_count = 0;
+
   for (RasterTaskQueue::Item::Vector::const_iterator it = queue->items.begin();
        it != queue->items.end();
        ++it) {
@@ -100,6 +94,7 @@ void GpuRasterWorkerPool::ScheduleTasks(RasterTaskQueue* queue) {
     DCHECK(!task->HasCompleted());
 
     if (item.required_for_activation) {
+      required_for_activation_count++;

[reveman, 2014/09/12 20:06:33]

nit: ++required_for_activation_count, pre-increment is preferred when possible
as that can be more efficient with some types

[ernstm, 2014/09/12 20:20:38]

Done.

       graph_.edges.push_back(TaskGraph::Edge(
           task, new_raster_required_for_activation_finished_task.get()));
     }
@@ -113,7 +108,7 @@ void GpuRasterWorkerPool::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,