Re-land: cc: Cleanup internal::WorkerPoolTaskClient interface.

cc/resources/direct_raster_worker_pool.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_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_
 
 #include "cc/resources/raster_worker_pool.h"
 
 namespace cc {
 
 class CC_EXPORT DirectRasterWorkerPool : public RasterWorkerPool {
  public:
   virtual ~DirectRasterWorkerPool();
 
   static scoped_ptr<RasterWorkerPool> Create(
       ResourceProvider* resource_provider,
       ContextProvider* context_provider);
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE;
   virtual unsigned GetResourceTarget() const OVERRIDE;
   virtual ResourceFormat GetResourceFormat() const OVERRIDE;
   virtual void CheckForCompletedTasks() OVERRIDE;
 
   // Overridden from internal::WorkerPoolTaskClient:
-  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
-      OVERRIDE;
-  virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
-                                 const PicturePileImpl::Analysis& analysis)
-      OVERRIDE;
-  virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE {
-  }
+  virtual SkCanvas* AcquireCanvasForRaster(internal::WorkerPoolTask* task,
+                                           const Resource* resource) OVERRIDE;
+  virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
+                                      const Resource* resource) OVERRIDE;
 
  protected:
   DirectRasterWorkerPool(ResourceProvider* resource_provider,
                          ContextProvider* context_provider);
 
  private:
   // Overridden from RasterWorkerPool:
   virtual void OnRasterTasksFinished() OVERRIDE;
   virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
 
@@ skipping 12 matching lines @@
   internal::WorkerPoolTask::Vector completed_tasks_;
 
   base::WeakPtrFactory<DirectRasterWorkerPool> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_