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

cc/resources/direct_raster_worker_pool.cc

 // 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.
 
 #include "cc/resources/direct_raster_worker_pool.h"
 
 #include "cc/output/context_provider.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ skipping 86 matching lines @@
        it != completed_tasks_.end();
        ++it) {
     internal::WorkerPoolTask* task = it->get();
 
     task->RunReplyOnOriginThread();
   }
   completed_tasks_.clear();
 }
 
 SkCanvas* DirectRasterWorkerPool::AcquireCanvasForRaster(
-    internal::RasterWorkerPoolTask* task) {
-  return resource_provider()->MapDirectRasterBuffer(task->resource()->id());
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  return resource_provider()->MapDirectRasterBuffer(resource->id());
 }
 
-void DirectRasterWorkerPool::OnRasterCompleted(
-    internal::RasterWorkerPoolTask* task,
-    const PicturePileImpl::Analysis& analysis) {
-  resource_provider()->UnmapDirectRasterBuffer(task->resource()->id());
+void DirectRasterWorkerPool::ReleaseCanvasForRaster(
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  resource_provider()->UnmapDirectRasterBuffer(resource->id());
 }
 
 void DirectRasterWorkerPool::OnRasterTasksFinished() {
   DCHECK(raster_tasks_pending_);
   raster_tasks_pending_ = false;
   client()->DidFinishRunningTasks();
 }
 
 void DirectRasterWorkerPool::OnRasterTasksRequiredForActivationFinished() {
   DCHECK(raster_tasks_required_for_activation_pending_);
@@ skipping 52 matching lines @@
     // TODO(alokp): Implement TestContextProvider::GrContext().
     if (gr_context)
       gr_context->flush();
   }
 
   RunTaskOnOriginThread(raster_required_for_activation_finished_task());
   RunTaskOnOriginThread(raster_finished_task());
 }
 
 }  // namespace cc