cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/raster/tile_task_worker_pool_unittest.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/raster/tile_task_worker_pool.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 33 matching lines @@
 const size_t kMaxBytesPerCopyOperation = 1000U;
 const size_t kMaxStagingBuffers = 32U;
 
 enum TileTaskWorkerPoolType {
   TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY,
   TILE_TASK_WORKER_POOL_TYPE_ONE_COPY,
   TILE_TASK_WORKER_POOL_TYPE_GPU,
   TILE_TASK_WORKER_POOL_TYPE_BITMAP
 };
 
+class TileTaskWorkerPoolTest;
+
 class TestRasterTaskImpl : public RasterTask {
  public:
-  typedef base::Callback<void(bool was_canceled)> Reply;
-
   TestRasterTaskImpl(const Resource* resource,
-                     const Reply& reply,
+                     scoped_ptr<RasterBuffer> raster_buffer,
                      ImageDecodeTask::Vector* dependencies)
       : RasterTask(dependencies),
         resource_(resource),
-        reply_(reply),
+        raster_buffer_(std::move(raster_buffer)),
         raster_source_(FakeRasterSource::CreateFilled(gfx::Size(1, 1))) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     uint64_t new_content_id = 0;
     raster_buffer_->Playback(raster_source_.get(), gfx::Rect(1, 1),
                              gfx::Rect(1, 1), new_content_id, 1.f,
                              RasterSource::PlaybackSettings());
   }
 
-  // Overridden from TileTask:
-  void ScheduleOnOriginThread(TileTaskClient* client) override {
-    // The raster buffer has no tile ids associated with it for partial update,
-    // so doesn't need to provide a valid dirty rect.
-    raster_buffer_ = client->AcquireBufferForRaster(resource_, 0, 0);
-  }
-  void CompleteOnOriginThread(TileTaskClient* client) override {
-    client->ReleaseBufferForRaster(std::move(raster_buffer_));
-    reply_.Run(!HasFinishedRunning());
-  }
-
  protected:
   ~TestRasterTaskImpl() override {}
 
  private:
+  friend class TileTaskWorkerPoolTest;
   const Resource* resource_;
-  const Reply reply_;
   scoped_ptr<RasterBuffer> raster_buffer_;
   scoped_refptr<RasterSource> raster_source_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
 };
 
 class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
  public:
   BlockingTestRasterTaskImpl(const Resource* resource,
-                             const Reply& reply,
+                             scoped_ptr<RasterBuffer> raster_buffer,
                              base::Lock* lock,
                              ImageDecodeTask::Vector* dependencies)
-      : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {}
+      : TestRasterTaskImpl(resource, std::move(raster_buffer), dependencies),
+        lock_(lock) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     base::AutoLock lock(*lock_);
     TestRasterTaskImpl::RunOnWorkerThread();
   }
 
  protected:
   ~BlockingTestRasterTaskImpl() override {}
 
@@ skipping 55 matching lines @@
             base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_,
             resource_provider_.get());
         break;
     }
 
     DCHECK(tile_task_worker_pool_);
   }
 
   void TearDown() override {
     tile_task_worker_pool_->AsTileTaskRunner()->Shutdown();
-    tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
+    CheckForCompletedTasks();
   }
 
   void AllTileTasksFinished() {
-    tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
+    CheckForCompletedTasks();
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
+  void CheckForCompletedTasks() {
+    Task::Vector completed_tasks;
+    tile_task_worker_pool_->AsTileTaskRunner()->CollectCompletedTasks(
+        &completed_tasks);
+
+    for (auto task : completed_tasks) {
+      TestRasterTaskImpl* raster_task =
+          static_cast<TestRasterTaskImpl*>(task.get());
+      CompleteRasterTask(0, !raster_task->HasFinishedRunning());
+      static_cast<TileTask*>(task.get())->DidComplete();
+    }
+  }
+
   void RunMessageLoopUntilAllTasksHaveCompleted() {
     task_graph_runner_.RunUntilIdle();
-    tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
+    CheckForCompletedTasks();
   }
 
   void ScheduleTasks() {
     graph_.Reset();
 
     size_t priority = 0;
 
     for (RasterTaskVector::const_iterator it = tasks_.begin();
          it != tasks_.end(); ++it) {
       graph_.nodes.emplace_back(it->get(), 0 /* group */, priority++,
                                 0 /* dependencies */);
     }
 
     tile_task_worker_pool_->AsTileTaskRunner()->ScheduleTasks(&graph_);
   }
 
   void AppendTask(unsigned id, const gfx::Size& size) {
     scoped_ptr<ScopedResource> resource(
         ScopedResource::Create(resource_provider_.get()));
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
     const Resource* const_resource = resource.get();
 
     ImageDecodeTask::Vector empty;
-    tasks_.push_back(new TestRasterTaskImpl(
-        const_resource,
-        base::Bind(&TileTaskWorkerPoolTest::OnTaskCompleted,
-                   base::Unretained(this), base::Passed(&resource), id),
-        &empty));
+    TileTaskClient* client =
+        reinterpret_cast<TileTaskClient*>(tile_task_worker_pool_.get());
+    scoped_ptr<RasterBuffer> raster_buffer =
+        client->AcquireBufferForRaster(const_resource, 0, 0);
+    tasks_.push_back(new TestRasterTaskImpl(const_resource,
+                                            std::move(raster_buffer), &empty));
   }
 
   void AppendTask(unsigned id) { AppendTask(id, gfx::Size(1, 1)); }
 
   void AppendBlockingTask(unsigned id, base::Lock* lock) {
     const gfx::Size size(1, 1);
 
     scoped_ptr<ScopedResource> resource(
         ScopedResource::Create(resource_provider_.get()));
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
     const Resource* const_resource = resource.get();
 
     ImageDecodeTask::Vector empty;
+    TileTaskClient* client =
+        reinterpret_cast<TileTaskClient*>(tile_task_worker_pool_.get());
+    scoped_ptr<RasterBuffer> raster_buffer =
+        client->AcquireBufferForRaster(const_resource, 0, 0);
     tasks_.push_back(new BlockingTestRasterTaskImpl(
-        const_resource,
-        base::Bind(&TileTaskWorkerPoolTest::OnTaskCompleted,
-                   base::Unretained(this), base::Passed(&resource), id),
-        lock, &empty));
+        const_resource, std::move(raster_buffer), lock, &empty));
   }
 
   const std::vector<RasterTaskResult>& completed_tasks() const {
     return completed_tasks_;
   }
 
   void LoseContext(ContextProvider* context_provider) {
     if (!context_provider)
       return;
     context_provider->ContextGL()->LoseContextCHROMIUM(
@@ skipping 13 matching lines @@
   }
 
   void CreateSoftwareOutputSurfaceAndResourceProvider() {
     output_surface_ = FakeOutputSurface::CreateSoftware(
         make_scoped_ptr(new SoftwareOutputDevice));
     CHECK(output_surface_->BindToClient(&output_surface_client_));
     resource_provider_ = FakeResourceProvider::Create(
         output_surface_.get(), &shared_bitmap_manager_, nullptr);
   }
 
-  void OnTaskCompleted(
-      scoped_ptr<ScopedResource> resource,
-      unsigned id,
-      bool was_canceled) {
+  void CompleteRasterTask(unsigned id, bool was_canceled) {
     RasterTaskResult result;
     result.id = id;
     result.canceled = was_canceled;
     completed_tasks_.push_back(result);
   }
 
   void OnTimeout() {
     timed_out_ = true;
     base::MessageLoop::current()->QuitWhenIdle();
   }
@@ skipping 85 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(TileTaskWorkerPoolTests,
                         TileTaskWorkerPoolTest,
                         ::testing::Values(TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_ONE_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_GPU,
                                           TILE_TASK_WORKER_POOL_TYPE_BITMAP));
 
 }  // namespace
 }  // namespace cc