cc: Simplify task and its derived classes.

cc/tiles/tile_manager_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 <stddef.h>
 #include <stdint.h>
 
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/playback/raster_source.h"
 #include "cc/playback/recording_source.h"
-#include "cc/raster/raster_buffer.h"
 #include "cc/resources/resource_pool.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_picture_layer_tiling_client.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/test/fake_recording_source.h"
@@ skipping 1790 matching lines @@
           // Since it's high res, the bitmap (blue) was drawn, and the
           // background is not visible.
           ASSERT_EQ(SK_ColorBLUE, bitmap->getColor(x, y));
         }
       }
     }
   }
 }
 
 // Fake TileTaskRunner that just no-ops all calls.
-class FakeTileTaskRunner : public TileTaskRunner, public TileTaskClient {
+class FakeTileTaskRunner : public TileTaskRunner {
  public:
   FakeTileTaskRunner() {}
   ~FakeTileTaskRunner() override {}
 
+  // RasterBufferProvider methods.
+  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
+      const Resource* resource,
+      uint64_t resource_content_id,
+      uint64_t previous_content_id) override {
+    NOTREACHED();
+    return nullptr;
+  }
+  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
+
   // TileTaskRunner methods.
   void Shutdown() override {}
   void CheckForCompletedTasks() override {}
   ResourceFormat GetResourceFormat(bool must_support_alpha) const override {
     return ResourceFormat::RGBA_8888;
   }
   bool GetResourceRequiresSwizzle(bool must_support_alpha) const override {
     return false;
   }
 
   void ScheduleTasks(TaskGraph* graph) override {}
-
-  // TileTaskClient methods.
-  scoped_ptr<RasterBuffer> AcquireBufferForRaster(
-      const Resource* resource,
-      uint64_t resource_content_id,
-      uint64_t previous_content_id) override {
-    NOTREACHED();
-    return nullptr;
-  }
-  void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
 };
 
 // Fake TileTaskRunner that just cancels all scheduled tasks immediately.
 class CancellingTileTaskRunner : public FakeTileTaskRunner {
  public:
   CancellingTileTaskRunner() {}
   ~CancellingTileTaskRunner() override {}
 
   void ScheduleTasks(TaskGraph* graph) override {
     // Just call CompleteOnOriginThread on each item in the queue. As none of
     // these items have run yet, they will be treated as cancelled tasks.
     for (const auto& node : graph->nodes) {
-      static_cast<TileTask*>(node.task)->CompleteOnOriginThread(this);
+      node.task->CompleteOnOriginThread();
     }
   }
 };
 
 class PartialRasterTileManagerTest : public TileManagerTest {
  public:
   void CustomizeSettings(LayerTreeSettings* settings) override {
     settings->use_partial_raster = true;
   }
 };
@@ skipping 52 matching lines @@
   host_impl_ = nullptr;
 }
 
 // Fake TileTaskRunner that verifies the resource content ID of raster tasks.
 class VerifyResourceContentIdTileTaskRunner : public FakeTileTaskRunner {
  public:
   explicit VerifyResourceContentIdTileTaskRunner(uint64_t expected_resource_id)
       : expected_resource_id_(expected_resource_id) {}
   ~VerifyResourceContentIdTileTaskRunner() override {}
 
-  void ScheduleTasks(TaskGraph* graph) override {
-    for (const auto& node : graph->nodes) {
-      TileTask* task = static_cast<TileTask*>(node.task);
-      // Triggers a call to AcquireBufferForRaster.
-      task->ScheduleOnOriginThread(this);
-      // Calls TileManager as though task was cancelled.
-      task->CompleteOnOriginThread(this);
-    }
-  }
-
-  // TileTaskClient methods.
+  // RasterBufferProvider methods.
   scoped_ptr<RasterBuffer> AcquireBufferForRaster(
       const Resource* resource,
       uint64_t resource_content_id,
       uint64_t previous_content_id) override {
     EXPECT_EQ(expected_resource_id_, resource_content_id);
     return nullptr;
   }
 
+  void ScheduleTasks(TaskGraph* graph) override {
+    for (const auto& node : graph->nodes) {
+      Task* task = node.task;
+      // Triggers a call to AcquireBufferForRaster.
+      task->ScheduleOnOriginThread();
+      // Calls TileManager as though task was cancelled.
+      task->CompleteOnOriginThread();
+    }
+  }
+
  private:
   uint64_t expected_resource_id_;
 };
 
 // Runs a test to ensure that partial raster is either enabled or disabled,
 // depending on |partial_raster_enabled|'s value. Takes ownership of host_impl
 // so that cleanup order can be controlled.
 void RunPartialRasterCheck(scoped_ptr<LayerTreeHostImpl> host_impl,
                            bool partial_raster_enabled) {
   // Pick arbitrary IDs - they don't really matter as long as they're constant.
@@ skipping 58 matching lines @@
 
 // Ensures that the tile manager does not attempt to reuse tiles when partial
 // raster is disabled.
 TEST_F(TileManagerTest, PartialRasterSuccessfullyDisabled) {
   RunPartialRasterCheck(std::move(host_impl_),
                         false /* partial_raster_enabled */);
 }
 
 }  // namespace
 }  // namespace cc