cc: Simplify task and its derived classes.

cc/tiles/tile_manager_perftest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
-#include "cc/raster/raster_buffer.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/test/fake_tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/test/test_tile_priorities.h"
 #include "cc/tiles/tile.h"
 #include "cc/tiles/tile_priority.h"
 #include "cc/trees/layer_tree_impl.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 namespace cc {
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
-class FakeTileTaskRunnerImpl : public TileTaskRunner, public TileTaskClient {
+class FakeTileTaskRunnerImpl : public TileTaskRunner {
  public:
+  // Overridden from RasterBufferProvider:
+  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
+      const Resource* resource,
+      uint64_t new_content_id,
+      uint64_t previous_content_id) override {
+    return nullptr;
+  }
+  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
+
   // Overridden from TileTaskRunner:
   void Shutdown() override {}
   void ScheduleTasks(TaskGraph* graph) override {
     for (auto& node : graph->nodes) {
-      TileTask* task = static_cast<TileTask*>(node.task);
+      Task* task = node.task;
 
       task->WillSchedule();
-      task->ScheduleOnOriginThread(this);
+      task->ScheduleOnOriginThread();
       task->DidSchedule();
 
       completed_tasks_.push_back(task);
     }
   }
   void CheckForCompletedTasks() override {
-    for (TileTask::Vector::iterator it = completed_tasks_.begin();
+    for (Task::Vector::iterator it = completed_tasks_.begin();
          it != completed_tasks_.end(); ++it) {
-      TileTask* task = it->get();
+      Task* task = it->get();
 
       task->WillComplete();
-      task->CompleteOnOriginThread(this);
+      task->CompleteOnOriginThread();
       task->DidComplete();
     }
     completed_tasks_.clear();
   }
   ResourceFormat GetResourceFormat(bool must_support_alpha) const override {
     return RGBA_8888;
   }
   bool GetResourceRequiresSwizzle(bool must_support_alpha) const override {
     return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
   }
 
-  // Overridden from TileTaskClient:
-  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
-      const Resource* resource,
-      uint64_t new_content_id,
-      uint64_t previous_content_id) override {
-    return nullptr;
-  }
-  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
-
  private:
-  TileTask::Vector completed_tasks_;
+  Task::Vector completed_tasks_;
 };
 base::LazyInstance<FakeTileTaskRunnerImpl> g_fake_tile_task_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 class TileManagerPerfTest : public testing::Test {
  public:
   TileManagerPerfTest()
       : memory_limit_policy_(ALLOW_ANYTHING),
         max_tiles_(10000),
         id_(7),
@@ skipping 380 matching lines @@
   RunEvictionQueueConstructAndIterateTest("10_64", 10, 64);
   RunEvictionQueueConstructAndIterateTest("10_128", 10, 128);
   RunEvictionQueueConstructAndIterateTest("50_16", 50, 16);
   RunEvictionQueueConstructAndIterateTest("50_32", 50, 32);
   RunEvictionQueueConstructAndIterateTest("50_64", 50, 64);
   RunEvictionQueueConstructAndIterateTest("50_128", 50, 128);
 }
 
 }  // namespace
 }  // namespace cc