cc: Refactor force upload mechanism to allow proper resource ownership passing.

Makes ResourceProvider changes required to allow reuse of resources
immediately after forcing "set pixels" to complete and removes
AbortSetPixels() which is no longer needed.

Improves the efficiency of forced uploads by issuing the "wait-for"
command as soon as we know that the upload can be forced. It also
provides a significant cleanup to RasterWorkerPool interface and
tile management.

BUG=245767

Review URL: https://chromiumcodereview.appspot.com/16926002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206352 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/cc/resources/pixel_buffer_raster_worker_pool.h b/cc/resources/pixel_buffer_raster_worker_pool.h
index 269b2f0..2a89d4b 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.h
+++ b/cc/resources/pixel_buffer_raster_worker_pool.h
@@ -28,7 +28,6 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE;
-  virtual bool ForceUploadToComplete(const RasterTask& raster_task) OVERRIDE;
 
  private:
   PixelBufferRasterWorkerPool(ResourceProvider* resource_provider,
@@ -43,7 +42,6 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
       scoped_refptr<internal::RasterWorkerPoolTask> task,
       bool was_canceled,
       bool needs_upload);
-  void AbortPendingUploads();
   void DidCompleteRasterTask(internal::RasterWorkerPoolTask* task);
   void OnRasterFinished(int64 schedule_more_tasks_count);
 
@@ -51,6 +49,8 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
       scoped_refptr<base::MessageLoopProxy> origin_loop,
       const base::Closure& on_raster_finished_callback);
 
+  bool shutdown_;
+
   TaskMap pixel_buffer_tasks_;
 
   typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> > TaskDeque;