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.h"
+#include "cc/base/scoped_ptr_deque.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
@@ skipping 31 matching lines @@
 
       scoped_refptr<internal::WorkerPoolTask> new_perf_task(
           new PerfWorkerPoolTaskImpl);
       perf_tasks[task] = new_perf_task;
     }
 
     perf_tasks_.swap(perf_tasks);
   }
 
   void BuildTaskGraph() {
-    RasterTaskGraph graph;
+    enum RasterTaskType {

[vmpstr, 2013/06/27 23:31:21]

This enum is in quite a few places, I think it's worth it to just pull it out to
RasterWorkerPool level. I know that this is just a test, but it also is defined
a couple of times in non-test code

[reveman, 2013/06/28 17:26:07]

Only used by pixel buffer RWP in latest patch.

+      PREPAINT_TYPE = 0,
+      REQUIRED_FOR_ACTIVATION_TYPE = 1,
+      NUM_TYPES = 2
+    };
+    ScopedPtrDeque<GraphNode> tasks[NUM_TYPES];
+    unsigned priority = 0;
+    TaskGraph graph;
 
     for (RasterTaskVector::const_iterator it = raster_tasks().begin();
          it != raster_tasks().end(); ++it) {
       internal::RasterWorkerPoolTask* task = it->get();
 
+      RasterTaskType type = IsRasterTaskRequiredForActivation(task) ?
+          REQUIRED_FOR_ACTIVATION_TYPE :
+          PREPAINT_TYPE;
+
       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());
+
+        tasks[type].push_back(
+            CreateRasterTaskGraphNode(perf_task,
+                                      task->dependencies(),
+                                      priority++,
+                                      &graph));
+      }
+    }
+
+    scoped_refptr<internal::WorkerPoolTask>
+        raster_finished_task(new PerfWorkerPoolTaskImpl);
+    scoped_ptr<GraphNode> raster_finished_node(
+        new GraphNode(raster_finished_task.get(), 0u));
+    for (unsigned i = 0; i < NUM_TYPES; ++i) {
+      for (unsigned j = 0; j < tasks[i].size(); ++j) {
+        raster_finished_node->add_dependency();
+        tasks[i][j]->add_dependent(raster_finished_node.get());
+      }
+    }
+    graph.set(raster_finished_task.get(), raster_finished_node.Pass());
+
+    scoped_refptr<internal::WorkerPoolTask>
+        raster_required_for_activation_finished_task(
+            new PerfWorkerPoolTaskImpl);
+    scoped_ptr<GraphNode> raster_required_for_activation_finished_node(
+        new GraphNode(raster_required_for_activation_finished_task.get(), 0u));
+    for (unsigned j = 0;
+         j < tasks[REQUIRED_FOR_ACTIVATION_TYPE].size();
+         ++j) {
+      raster_required_for_activation_finished_node->add_dependency();
+      tasks[REQUIRED_FOR_ACTIVATION_TYPE][j]->add_dependent(
+          raster_required_for_activation_finished_node.get());
+    }
+    graph.set(raster_required_for_activation_finished_task.get(),
+              raster_required_for_activation_finished_node.Pass());
+
+    for (unsigned i = 0; i < NUM_TYPES; ++i) {
+      while (!tasks[i].empty()) {
+        scoped_ptr<GraphNode> node = tasks[i].take_front();
+        internal::WorkerPoolTask* task = node->task();
+        graph.set(task, node.Pass());
       }
     }
   }
 
  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