Revert of Refactor signaling in RWP

cc/raster/task_graph_work_queue.h

 // Copyright 2014 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.
 
 #ifndef CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_
 #define CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_
 
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 42 matching lines @@
     TaskNamespace();
     ~TaskNamespace();
 
     // Current task graph.
     TaskGraph graph;
 
     // Map from category to a vector of tasks that are ready to run for that
     // category.
     std::map<uint16_t, PrioritizedTask::Vector> ready_to_run_tasks;
 
-    // This set contains all currently running tasks.
-    std::map<uint16_t, Task::Vector> running_tasks;
-
     // Completed tasks not yet collected by origin thread.
     Task::Vector completed_tasks;
+
+    // This set contains all currently running tasks.
+    Task::Vector running_tasks;
   };
 
   TaskGraphWorkQueue();
   virtual ~TaskGraphWorkQueue();
 
   // Gets a NamespaceToken which is guaranteed to be unique within this
   // TaskGraphWorkQueue.
   NamespaceToken GetNamespaceToken();
 
   // Updates a TaskNamespace with a new TaskGraph to run. This cancels any
@@ skipping 27 matching lines @@
     return std::find_if(task_namespace->ready_to_run_tasks.begin(),
                         task_namespace->ready_to_run_tasks.end(),
                         [](const std::pair<uint16_t, PrioritizedTask::Vector>&
                                ready_to_run_tasks) {
                           return !ready_to_run_tasks.second.empty();
                         }) != task_namespace->ready_to_run_tasks.end();
   }
 
   static bool HasFinishedRunningTasksInNamespace(
       const TaskNamespace* task_namespace) {
-    return std::all_of(
-               task_namespace->running_tasks.cbegin(),
-               task_namespace->running_tasks.cend(),
-               [](const std::pair<uint16_t, Task::Vector>& tasks_entry) {
-                 return tasks_entry.second.empty();
-               }) &&
+    return task_namespace->running_tasks.empty() &&
            !HasReadyToRunTasksInNamespace(task_namespace);
   }
 
   bool HasReadyToRunTasks() const {
     return std::find_if(ready_to_run_namespaces_.begin(),
                         ready_to_run_namespaces_.end(),
                         [](const std::pair<uint16_t, TaskNamespace::Vector>&
                                ready_to_run_namespaces) {
                           return !ready_to_run_namespaces.second.empty();
                         }) != ready_to_run_namespaces_.end();
@@ skipping 12 matching lines @@
                [](const TaskNamespaceMap::value_type& entry) {
                  return !HasFinishedRunningTasksInNamespace(&entry.second);
                }) == namespaces_.end();
   }
 
   const std::map<uint16_t, TaskNamespace::Vector>& ready_to_run_namespaces()
       const {
     return ready_to_run_namespaces_;
   }
 
-  size_t NumRunningTasksForCategory(uint16_t category) const {
-    size_t count = 0;
-    for (const auto& task_namespace_entry : namespaces_) {
-      const auto& running_tasks = task_namespace_entry.second.running_tasks;
-      const auto& running_tasks_for_category = running_tasks.find(category);
-      if (running_tasks_for_category != running_tasks.cend()) {
-        count += running_tasks_for_category->second.size();
-      }
-    }
-    return count;
-  }
-
   // Helper function which ensures that graph dependencies were correctly
   // configured.
   static bool DependencyMismatch(const TaskGraph* graph);
 
  private:
   // Helper class used to provide NamespaceToken comparison to TaskNamespaceMap.
   class CompareToken {
    public:
     bool operator()(const NamespaceToken& lhs,
                     const NamespaceToken& rhs) const {
       return lhs.id_ < rhs.id_;
     }
   };
 
   using TaskNamespaceMap =
       std::map<NamespaceToken, TaskNamespace, CompareToken>;
 
   TaskNamespaceMap namespaces_;
 
   // Map from category to a vector of ready to run namespaces for that category.
   std::map<uint16_t, TaskNamespace::Vector> ready_to_run_namespaces_;
 
   // Provides a unique id to each NamespaceToken.
   int next_namespace_id_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_TASK_GRAPH_WORK_QUEUE_H_