Re-land: cc: Add raster finished signals to RasterWorkerPool.

cc/resources/raster_worker_pool_perftest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/raster_worker_pool.h"
 
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
@@ skipping 20 matching lines @@
   virtual ~PerfRasterWorkerPool() {}
 
   static scoped_ptr<PerfRasterWorkerPool> Create() {
     return make_scoped_ptr(new PerfRasterWorkerPool);
   }
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
     NOTREACHED();
   }
+  virtual void OnRasterTasksFinished() OVERRIDE {
+    NOTREACHED();
+  }
+  virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE {
+    NOTREACHED();
+  }
 
   void SetRasterTasks(RasterTask::Queue* queue) {
     RasterWorkerPool::SetRasterTasks(queue);
 
     TaskMap perf_tasks;
     for (RasterTaskVector::const_iterator it = raster_tasks().begin();
          it != raster_tasks().end(); ++it) {
       internal::RasterWorkerPoolTask* task = it->get();
 
       scoped_refptr<internal::WorkerPoolTask> new_perf_task(
           new PerfWorkerPoolTaskImpl);
       perf_tasks[task] = new_perf_task;
     }
 
     perf_tasks_.swap(perf_tasks);
   }
 
   void BuildTaskGraph() {
-    RasterTaskGraph graph;
+    unsigned priority = 0;
+    TaskGraph graph;
+
+    scoped_refptr<internal::WorkerPoolTask>
+        raster_required_for_activation_finished_task(
+            CreateRasterRequiredForActivationFinishedTask());
+    GraphNode* raster_required_for_activation_finished_node =
+        CreateGraphNodeForTask(
+            raster_required_for_activation_finished_task.get(),
+            priority++,
+            &graph);
+
+    scoped_refptr<internal::WorkerPoolTask> raster_finished_task(
+        CreateRasterFinishedTask());
+    GraphNode* raster_finished_node =
+        CreateGraphNodeForTask(raster_finished_task.get(),
+                               priority++,
+                               &graph);
 
     for (RasterTaskVector::const_iterator it = raster_tasks().begin();
          it != raster_tasks().end(); ++it) {
       internal::RasterWorkerPoolTask* task = it->get();
 
       TaskMap::iterator perf_it = perf_tasks_.find(task);
       DCHECK(perf_it != perf_tasks_.end());
       if (perf_it != perf_tasks_.end()) {
         internal::WorkerPoolTask* perf_task = perf_it->second.get();
-        graph.InsertRasterTask(perf_task, task->dependencies());
+
+        GraphNode* perf_node =
+            CreateGraphNodeForRasterTask(perf_task,
+                                         task->dependencies(),
+                                         priority++,
+                                         &graph);
+
+        if (IsRasterTaskRequiredForActivation(task)) {
+          raster_required_for_activation_finished_node->add_dependency();
+          perf_node->add_dependent(
+              raster_required_for_activation_finished_node);
+        }
+
+        raster_finished_node->add_dependency();
+        perf_node->add_dependent(raster_finished_node);
       }
     }
   }
 
  private:
   TaskMap perf_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(PerfRasterWorkerPool);
 };
 
@@ skipping 111 matching lines @@
   RunBuildTaskGraphTest("build_task_graph_100_4", 100, 4);
   RunBuildTaskGraphTest("build_task_graph_1000_4", 1000, 4);
   RunBuildTaskGraphTest("build_task_graph_10_16", 10, 16);
   RunBuildTaskGraphTest("build_task_graph_100_16", 100, 16);
   RunBuildTaskGraphTest("build_task_graph_1000_16", 1000, 16);
 }
 
 }  // namespace
 
 }  // namespace cc