Revert "cc: Simplify raster task completion notification logic"

cc/resources/pixel_buffer_raster_worker_pool.cc

Index: cc/resources/pixel_buffer_raster_worker_pool.cc
diff --git a/cc/resources/pixel_buffer_raster_worker_pool.cc b/cc/resources/pixel_buffer_raster_worker_pool.cc
index ec65214c15ee9232bb7ef71b283ec727ab98a89e..011e5147e066e4c3e294aceb14ae22bc0b931f31 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.cc
+++ b/cc/resources/pixel_buffer_raster_worker_pool.cc
@@ -102,9 +102,7 @@ PixelBufferRasterWorkerPool::PixelBufferRasterWorkerPool(
       check_for_completed_raster_tasks_pending_(false),
       should_notify_client_if_no_tasks_are_pending_(false),
       should_notify_client_if_no_tasks_required_for_activation_are_pending_(
-          false),
-      raster_finished_task_pending_(false),
-      raster_required_for_activation_finished_task_pending_(false) {
+          false) {
 }
 
 PixelBufferRasterWorkerPool::~PixelBufferRasterWorkerPool() {
@@ -257,7 +255,6 @@ void PixelBufferRasterWorkerPool::OnRasterTasksFinished() {
   // perform another check in that case as we've already notified the client.
   if (!should_notify_client_if_no_tasks_are_pending_)
     return;
-  raster_finished_task_pending_ = false;
 
   // Call CheckForCompletedRasterTasks() when we've finished running all
   // raster tasks needed since last time ScheduleTasks() was called.
@@ -271,7 +268,6 @@ void PixelBufferRasterWorkerPool::OnRasterTasksRequiredForActivationFinished() {
   // CheckForCompletedRasterTasks() if the client has already been notified.
   if (!should_notify_client_if_no_tasks_required_for_activation_are_pending_)
     return;
-  raster_required_for_activation_finished_task_pending_ = false;
 
   // This reduces latency between the time when all tasks required for
   // activation have finished running and the time when the client is
@@ -390,11 +386,9 @@ void PixelBufferRasterWorkerPool::CheckForCompletedRasterTasks() {
   // Determine what client notifications to generate.
   bool will_notify_client_that_no_tasks_required_for_activation_are_pending =
       (should_notify_client_if_no_tasks_required_for_activation_are_pending_ &&
-       !raster_required_for_activation_finished_task_pending_ &&
        !HasPendingTasksRequiredForActivation());
   bool will_notify_client_that_no_tasks_are_pending =
       (should_notify_client_if_no_tasks_are_pending_ &&
-       !raster_finished_task_pending_ &&
        !HasPendingTasks());
 
   // Adjust the need to generate notifications before scheduling more tasks.
@@ -540,7 +534,6 @@ void PixelBufferRasterWorkerPool::ScheduleMoreTasks() {
       should_notify_client_if_no_tasks_required_for_activation_are_pending_) {
     new_raster_required_for_activation_finished_task =
         CreateRasterRequiredForActivationFinishedTask();
-    raster_required_for_activation_finished_task_pending_ = true;
     internal::GraphNode* raster_required_for_activation_finished_node =
         CreateGraphNodeForTask(
             new_raster_required_for_activation_finished_task.get(),
@@ -562,7 +555,6 @@ void PixelBufferRasterWorkerPool::ScheduleMoreTasks() {
   if (scheduled_raster_task_count == PendingRasterTaskCount() &&
       should_notify_client_if_no_tasks_are_pending_) {
     new_raster_finished_task = CreateRasterFinishedTask();
-    raster_finished_task_pending_ = true;
     internal::GraphNode* raster_finished_node =
         CreateGraphNodeForTask(new_raster_finished_task.get(),
                                1u,  // Priority 1