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

cc/resources/pixel_buffer_raster_worker_pool.h

 // 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.
 
 #ifndef CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 
 #include <deque>
 #include <set>
 
@@ skipping 15 matching lines @@
   virtual void Shutdown() OVERRIDE;
   virtual void CheckForCompletedTasks() OVERRIDE;
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE;
 
  private:
   PixelBufferRasterWorkerPool(ResourceProvider* resource_provider,
                               size_t num_threads);
 
-  // Overridden from RasterWorkerPool:
-  virtual void OnRasterTasksFinished() OVERRIDE;
-
   void FlushUploads();
   void CheckForCompletedUploads();
   void ScheduleCheckForCompletedRasterTasks();
   void CheckForCompletedRasterTasks();
   void ScheduleMoreTasks();
+  void OnRasterFinished(int64 schedule_raster_tasks_count);
+  void OnRasterRequiredForActivationFinished(
+      int64 schedule_raster_tasks_count);
   void OnRasterTaskCompleted(
       scoped_refptr<internal::RasterWorkerPoolTask> task,
       bool was_canceled,
       bool needs_upload);
   void DidCompleteRasterTask(internal::RasterWorkerPoolTask* task);
+  unsigned PendingRasterTaskCount() const;
+  bool NotifyClientThatFinishedRunningTasksRequiredForActivation();
+  bool NotifyClientThatFinishedRunningTasks();
 
   bool shutdown_;
 
   TaskMap pixel_buffer_tasks_;
 
   typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> > TaskDeque;
   TaskDeque tasks_with_pending_upload_;
   TaskDeque completed_tasks_;
 
+  typedef std::set<internal::RasterWorkerPoolTask*> TaskSet;
+  TaskSet tasks_required_for_activation_;
+
   size_t bytes_pending_upload_;
   bool has_performed_uploads_since_last_flush_;
   base::CancelableClosure check_for_completed_raster_tasks_callback_;
   bool check_for_completed_raster_tasks_pending_;
 
+  base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_ptr_factory_;
+  int64 schedule_raster_tasks_count_;
+
+  bool finished_running_tasks_pending_;
+  bool finished_running_tasks_required_for_activation_pending_;
+
+  scoped_refptr<internal::WorkerPoolTask> raster_finished_task_;
+  scoped_refptr<internal::WorkerPoolTask>
+      raster_required_for_activation_finished_task_;
+
   DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_