cc: Simplify Task and its derived classes.

cc/tiles/tile_manager.h

 // 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.
 
 #ifndef CC_TILES_TILE_MANAGER_H_
 #define CC_TILES_TILE_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/values.h"
 #include "cc/base/unique_notifier.h"
 #include "cc/playback/raster_source.h"
-#include "cc/raster/tile_task_runner.h"
 #include "cc/raster/tile_task_worker_pool.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/tiles/eviction_tile_priority_queue.h"
 #include "cc/tiles/image_decode_controller.h"
 #include "cc/tiles/raster_tile_priority_queue.h"
 #include "cc/tiles/tile.h"
 #include "cc/tiles/tile_draw_info.h"
 
 namespace base {
@@ skipping 210 matching lines @@
    private:
     int64_t memory_bytes_;
     int resource_count_;
   };
 
   void CheckAndProcessCompletedTasks();
   void RasterTaskCompleted(Task* task);
 
   void FreeResourcesForTile(Tile* tile);
   void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
-  scoped_refptr<RasterTask> CreateRasterTask(
-      const PrioritizedTile& prioritized_tile);
+  scoped_refptr<Task> CreateRasterTask(const PrioritizedTile& prioritized_tile);
 
   std::unique_ptr<EvictionTilePriorityQueue>
   FreeTileResourcesUntilUsageIsWithinLimit(
       std::unique_ptr<EvictionTilePriorityQueue> eviction_priority_queue,
       const MemoryUsage& limit,
       MemoryUsage* usage);
   std::unique_ptr<EvictionTilePriorityQueue>
   FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit(
       std::unique_ptr<EvictionTilePriorityQueue> eviction_priority_queue,
       const MemoryUsage& limit,
       const TilePriority& oother_priority,
       MemoryUsage* usage);
   bool TilePriorityViolatesMemoryPolicy(const TilePriority& priority);
   bool AreRequiredTilesReadyToDraw(RasterTilePriorityQueue::Type type) const;
   void CheckIfMoreTilesNeedToBePrepared();
   void CheckAndIssueSignals();
   bool MarkTilesOutOfMemory(
       std::unique_ptr<RasterTilePriorityQueue> queue) const;
 
   ResourceFormat DetermineResourceFormat(const Tile* tile) const;
   bool DetermineResourceRequiresSwizzle(const Tile* tile) const;
 
   void DidFinishRunningTileTasksRequiredForActivation();
   void DidFinishRunningTileTasksRequiredForDraw();
   void DidFinishRunningAllTileTasks();
 
-  scoped_refptr<TileTask> CreateTaskSetFinishedTask(
+  scoped_refptr<Task> CreateTaskSetFinishedTask(
       void (TileManager::*callback)());
 
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
   ScheduledTasksStateAsValue() const;
 
   TileManagerClient* client_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   ResourcePool* resource_pool_;
   TileTaskWorkerPool* tile_task_worker_pool_;
   GlobalStateThatImpactsTilePriority global_state_;
   size_t scheduled_raster_task_limit_;
   const bool use_partial_raster_;
   bool use_gpu_rasterization_;
 
   using TileMap = std::unordered_map<Tile::Id, Tile*>;
   TileMap tiles_;
 
   bool all_tiles_that_need_to_be_rasterized_are_scheduled_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   bool did_check_and_process_completed_tasks_since_last_schedule_tasks_;
   bool did_oom_on_last_assign_;
 
   ImageDecodeController* image_decode_controller_;
 
   RasterTaskCompletionStats flush_stats_;
 
   std::vector<Tile*> released_tiles_;
 
-  std::vector<scoped_refptr<TileTask>> orphan_tasks_;
+  Task::Vector orphan_tasks_;
 
   TaskGraph graph_;
-  scoped_refptr<TileTask> required_for_activation_done_task_;
-  scoped_refptr<TileTask> required_for_draw_done_task_;
-  scoped_refptr<TileTask> all_done_task_;
+  scoped_refptr<Task> required_for_activation_done_task_;
+  scoped_refptr<Task> required_for_draw_done_task_;
+  scoped_refptr<Task> all_done_task_;
 
   UniqueNotifier more_tiles_need_prepare_check_notifier_;
 
   struct Signals {
     Signals();
 
     void reset();
 
     bool ready_to_activate;
     bool did_notify_ready_to_activate;
@@ skipping 13 matching lines @@
   std::unordered_map<Tile::Id, std::vector<DrawImage>> scheduled_draw_images_;
 
   base::WeakPtrFactory<TileManager> task_set_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_TILE_MANAGER_H_