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

cc/resources/raster_worker_pool.cc

 // 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.
 
 #include "cc/resources/raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event_synthetic_delay.h"
 #include "base/json/json_writer.h"
@@ skipping 94 matching lines @@
     Analyze(picture_pile_->GetCloneForDrawingOnThread(thread_index));
     if (!canvas_ || analysis_.is_solid_color)
       return;
     Raster(picture_pile_->GetCloneForDrawingOnThread(thread_index));
   }
 
   // Overridden from internal::WorkerPoolTask:
   virtual void ScheduleOnOriginThread(internal::WorkerPoolTaskClient* client)
       OVERRIDE {
     DCHECK(!canvas_);
-    canvas_ = client->AcquireCanvasForRaster(this);
+    canvas_ = client->AcquireCanvasForRaster(this, resource());
   }
   virtual void RunOnOriginThread() OVERRIDE {
     TRACE_EVENT0("cc", "RasterWorkerPoolTaskImpl::RunOnOriginThread");
 
     Analyze(picture_pile_);
     if (!canvas_ || analysis_.is_solid_color)
       return;
     // TODO(alokp): Use a trace macro to push/pop markers.
     // Using push/pop functions directly incurs cost to evaluate function
     // arguments even when tracing is disabled.
     DCHECK(context_provider_);
     context_provider_->ContextGL()->PushGroupMarkerEXT(
         0,
         base::StringPrintf(
             "Raster-%d-%d-%p", source_frame_number_, layer_id_, tile_id_)
             .c_str());
     Raster(picture_pile_);
     context_provider_->ContextGL()->PopGroupMarkerEXT();
   }
   virtual void CompleteOnOriginThread(internal::WorkerPoolTaskClient* client)
       OVERRIDE {
     canvas_ = NULL;
-    client->OnRasterCompleted(this, analysis_);
+    client->ReleaseCanvasForRaster(this, resource());
   }
   virtual void RunReplyOnOriginThread() OVERRIDE {
     DCHECK(!canvas_);
     reply_.Run(analysis_, !HasFinishedRunning());
   }
 
  protected:
   virtual ~RasterWorkerPoolTaskImpl() { DCHECK(!canvas_); }
 
  private:
@@ skipping 114 matching lines @@
   }
 
   // Overridden from internal::WorkerPoolTask:
   virtual void ScheduleOnOriginThread(internal::WorkerPoolTaskClient* client)
       OVERRIDE {}
   virtual void RunOnOriginThread() OVERRIDE {
     TRACE_EVENT0("cc", "ImageDecodeWorkerPoolTaskImpl::RunOnOriginThread");
     Decode();
   }
   virtual void CompleteOnOriginThread(internal::WorkerPoolTaskClient* client)
-      OVERRIDE {
-    client->OnImageDecodeCompleted(this);
-  }
+      OVERRIDE {}
   virtual void RunReplyOnOriginThread() OVERRIDE {
     reply_.Run(!HasFinishedRunning());
   }
 
  protected:
   virtual ~ImageDecodeWorkerPoolTaskImpl() {}
 
  private:
   void Decode() {
     devtools_instrumentation::ScopedImageDecodeTask image_decode_task(
@@ skipping 406 matching lines @@
     if (decode_it == graph->nodes.end())
       InsertNodeForTask(graph, decode_task, priority, 0u);
 
     graph->edges.push_back(internal::TaskGraph::Edge(decode_task, raster_task));
   }
 
   InsertNodeForTask(graph, raster_task, priority, dependencies);
 }
 
 }  // namespace cc