cc: Simplify Task and its derived classes.

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>
 #include <limits>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/base/unique_notifier.h"
 #include "cc/raster/bitmap_tile_task_worker_pool.h"
 #include "cc/raster/gpu_rasterizer.h"
 #include "cc/raster/gpu_tile_task_worker_pool.h"
 #include "cc/raster/one_copy_tile_task_worker_pool.h"
 #include "cc/raster/synchronous_task_graph_runner.h"
-#include "cc/raster/tile_task_runner.h"
 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 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 {
+class TestRasterTaskImpl : public Task {
  public:
   TestRasterTaskImpl(std::unique_ptr<ScopedResource> resource,
                      std::unique_ptr<RasterBuffer> raster_buffer,
-                     ImageDecodeTask::Vector* dependencies)
-      : RasterTask(dependencies),
+                     Task::Vector* dependencies)
+      : Task(dependencies),
         resource_(std::move(resource)),
         raster_buffer_(std::move(raster_buffer)),
         raster_source_(FakeRasterSource::CreateFilled(gfx::Size(1, 1))) {
-    SetTaskTypeId(TASK_TYPE_RASTER);
+    SetTaskType(TASK_TYPE_RASTER);
   }
 
   // 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());
   }
 
  protected:
   ~TestRasterTaskImpl() override {}
 
  private:
   friend class TileTaskWorkerPoolTest;
   std::unique_ptr<ScopedResource> resource_;
   std::unique_ptr<RasterBuffer> raster_buffer_;
   scoped_refptr<RasterSource> raster_source_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
 };
 
 class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
  public:
   BlockingTestRasterTaskImpl(std::unique_ptr<ScopedResource> resource,
                              std::unique_ptr<RasterBuffer> raster_buffer,
                              base::Lock* lock,
-                             ImageDecodeTask::Vector* dependencies)
+                             Task::Vector* dependencies)
       : TestRasterTaskImpl(std::move(resource),
                            std::move(raster_buffer),
                            dependencies),
         lock_(lock) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     base::AutoLock lock(*lock_);
     TestRasterTaskImpl::RunOnWorkerThread();
   }
 
  protected:
   ~BlockingTestRasterTaskImpl() override {}
 
  private:
   base::Lock* lock_;
 
   DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterTaskImpl);
 };
 
 class TileTaskWorkerPoolTest
     : public testing::TestWithParam<TileTaskWorkerPoolType> {
  public:
   struct RasterTaskResult {
     unsigned id;
     bool canceled;
   };
 
-  typedef std::vector<scoped_refptr<RasterTask>> RasterTaskVector;
+  typedef Task::Vector RasterTaskVector;
 
   enum NamedTaskSet { REQUIRED_FOR_ACTIVATION, REQUIRED_FOR_DRAW, ALL };
 
   TileTaskWorkerPoolTest()
       : context_provider_(TestContextProvider::Create()),
         worker_context_provider_(TestContextProvider::CreateWorker()),
         all_tile_tasks_finished_(
             base::ThreadTaskRunnerHandle::Get()
                 .get(),
             base::Bind(&TileTaskWorkerPoolTest::AllTileTasksFinished,
@@ skipping 45 matching lines @@
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void CheckAndProcessCompletedTasks() {
     Task::Vector completed_tasks;
     tile_task_worker_pool_->CollectCompletedTasks(&completed_tasks);
 
     for (auto task : completed_tasks) {
       // Don't process image decode tasks as there are no dependencies for
       // raster tasks in the tests.
-      if (task->GetTaskTypeId() == TASK_TYPE_RASTER) {
+      if (task->GetTaskType() == TASK_TYPE_RASTER) {
         TestRasterTaskImpl* raster_task =
             static_cast<TestRasterTaskImpl*>(task.get());
         RasterTaskCompleted(0, !raster_task->HasFinishedRunning());
       }
-      static_cast<TileTask*>(task.get())->DidComplete();
+      task->DidComplete();
     }
   }
 
   void RunMessageLoopUntilAllTasksHaveCompleted() {
     task_graph_runner_.RunUntilIdle();
     CheckAndProcessCompletedTasks();
   }
 
   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_->ScheduleTasks(&graph_);
   }
 
   void AppendTask(unsigned id, const gfx::Size& size) {
     std::unique_ptr<ScopedResource> resource(
         ScopedResource::Create(resource_provider_.get()));
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
 
-    ImageDecodeTask::Vector empty;
+    Task::Vector empty;
     std::unique_ptr<RasterBuffer> raster_buffer =
         tile_task_worker_pool_->AsRasterBufferProvider()
             ->AcquireBufferForRaster(resource.get(), 0, 0);
     tasks_.push_back(new TestRasterTaskImpl(std::move(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);
 
     std::unique_ptr<ScopedResource> resource(
         ScopedResource::Create(resource_provider_.get()));
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
 
-    ImageDecodeTask::Vector empty;
+    Task::Vector empty;
     std::unique_ptr<RasterBuffer> raster_buffer =
         tile_task_worker_pool_->AsRasterBufferProvider()
             ->AcquireBufferForRaster(resource.get(), 0, 0);
 
     tasks_.push_back(new BlockingTestRasterTaskImpl(
         std::move(resource), std::move(raster_buffer), lock, &empty));
   }
 
   const std::vector<RasterTaskResult>& completed_tasks() const {
     return completed_tasks_;
@@ skipping 125 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