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

cc/test/fake_tile_manager.cc

 // Copyright 2012 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/test/fake_tile_manager.h"
 
 #include <deque>
 #include <limits>
 
 #include "cc/resources/raster_worker_pool.h"
 
 namespace cc {
 
 namespace {
 
 class FakeRasterWorkerPool : public RasterWorkerPool {
  public:
   FakeRasterWorkerPool() : RasterWorkerPool(NULL, NULL) {}
 
   // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE {
     for (RasterTaskQueue::Item::Vector::const_iterator it =
              queue->items.begin();
          it != queue->items.end();
          ++it) {
       internal::RasterWorkerPoolTask* task = it->task;
 
+      task->WillSchedule();
+      task->ScheduleOnOriginThread(this);
       task->DidSchedule();
 
       completed_tasks_.push_back(task);
     }
   }
   virtual void CheckForCompletedTasks() OVERRIDE {
     while (!completed_tasks_.empty()) {
       internal::WorkerPoolTask* task = completed_tasks_.front().get();
 
       task->WillComplete();
+      task->CompleteOnOriginThread(this);
       task->DidComplete();
+
       task->RunReplyOnOriginThread();
 
       completed_tasks_.pop_front();
     }
   }
   virtual GLenum GetResourceTarget() const OVERRIDE {
     return GL_TEXTURE_2D;
   }
   virtual ResourceFormat GetResourceFormat() const OVERRIDE {
     return RGBA_8888;
   }
 
   // Overridden from internal::WorkerPoolTaskClient:
-  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
-      OVERRIDE {
+  virtual SkCanvas* AcquireCanvasForRaster(internal::WorkerPoolTask* task,
+                                           const Resource* resource) OVERRIDE {
     return NULL;
   }
-  virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
-                                 const PicturePileImpl::Analysis& analysis)
-      OVERRIDE {}
-  virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE {
-  }
+  virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
+                                      const Resource* resource) OVERRIDE {}
 
  private:
   // Overridden from RasterWorkerPool:
   virtual void OnRasterTasksFinished() OVERRIDE {}
   virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE {}
 
   TaskDeque completed_tasks_;
 };
 
 }  // namespace
@@ skipping 64 matching lines @@
 void FakeTileManager::DidFinishRunningTasksForTesting() {
   DidFinishRunningTasks();
 }
 
 void FakeTileManager::Release(Tile* tile) {
   TileManager::Release(tile);
   CleanUpReleasedTiles();
 }
 
 }  // namespace cc