Revert of cc: Cleanup tile manager a bit.

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>
 
@@ skipping 77 matching lines @@
 };
 std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
 RasterTaskCompletionStatsAsValue(const RasterTaskCompletionStats& stats);
 
 // This class manages tiles, deciding which should get rasterized and which
 // should no longer have any memory assigned to them. Tile objects are "owned"
 // by layers; they automatically register with the manager when they are
 // created, and unregister from the manager when they are deleted.
 class CC_EXPORT TileManager {
  public:
-  TileManager(TileManagerClient* client,
-              scoped_refptr<base::SequencedTaskRunner> task_runner,
-              size_t scheduled_raster_task_limit,
-              bool use_partial_raster);
+  static std::unique_ptr<TileManager> Create(
+      TileManagerClient* client,
+      base::SequencedTaskRunner* task_runner,
+      size_t scheduled_raster_task_limit,
+      bool use_partial_raster);
   virtual ~TileManager();
 
   // Assigns tile memory and schedules work to prepare tiles for drawing.
   // - Runs client_->NotifyReadyToActivate() when all tiles required for
   // activation are prepared, or failed to prepare due to OOM.
   // - Runs client_->NotifyReadyToDraw() when all tiles required draw are
   // prepared, or failed to prepare due to OOM.
   bool PrepareTiles(const GlobalStateThatImpactsTilePriority& state);
 
   // Synchronously finish any in progress work, cancel the rest, and clean up as
@@ skipping 54 matching lines @@
 
   void SetTileTaskManagerForTesting(TileTaskManager* tile_task_manager);
 
   void FreeResourcesAndCleanUpReleasedTilesForTesting() {
     FreeResourcesForReleasedTiles();
     CleanUpReleasedTiles();
   }
 
   std::vector<Tile*> AllTilesForTesting() const {
     std::vector<Tile*> tiles;
-    for (auto& tile_pair : tiles_)
-      tiles.push_back(tile_pair.second);
+    for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end();
+         ++it) {
+      tiles.push_back(it->second);
+    }
     return tiles;
   }
 
   void SetScheduledRasterTaskLimitForTesting(size_t limit) {
     scheduled_raster_task_limit_ = limit;
   }
 
   void CheckIfMoreTilesNeedToBePreparedForTesting() {
     CheckIfMoreTilesNeedToBePrepared();
   }
 
   void SetMoreTilesNeedToBeRasterizedForTesting() {
     all_tiles_that_need_to_be_rasterized_are_scheduled_ = false;
   }
 
   bool HasScheduledTileTasksForTesting() const {
     return has_scheduled_tile_tasks_;
   }
 
  protected:
+  TileManager(TileManagerClient* client,
+              scoped_refptr<base::SequencedTaskRunner> task_runner,
+              size_t scheduled_raster_task_limit,
+              bool use_partial_raster);
+
   void FreeResourcesForReleasedTiles();
   void CleanUpReleasedTiles();
 
   friend class Tile;
   // Virtual for testing.
   virtual void Release(Tile* tile);
   Tile::Id GetUniqueTileId() { return ++next_tile_id_; }
 
+  typedef std::vector<PrioritizedTile> PrioritizedTileVector;
+  typedef std::set<Tile*> TileSet;
+
   // Virtual for test
   virtual void ScheduleTasks(
-      const std::vector<PrioritizedTile>& tiles_that_need_to_be_rasterized);
+      const PrioritizedTileVector& tiles_that_need_to_be_rasterized);
+
+  void AssignGpuMemoryToTiles(
+      RasterTilePriorityQueue* raster_priority_queue,
+      size_t scheduled_raser_task_limit,
+      PrioritizedTileVector* tiles_that_need_to_be_rasterized);
 
  private:
   class MemoryUsage {
    public:
     MemoryUsage();
     MemoryUsage(size_t memory_bytes, size_t resource_count);
 
     static MemoryUsage FromConfig(const gfx::Size& size, ResourceFormat format);
     static MemoryUsage FromTile(const Tile* tile);
 
@@ skipping 39 matching lines @@
 
   ResourceFormat DetermineResourceFormat(const Tile* tile) const;
   bool DetermineResourceRequiresSwizzle(const Tile* tile) const;
 
   void DidFinishRunningTileTasksRequiredForActivation();
   void DidFinishRunningTileTasksRequiredForDraw();
   void DidFinishRunningAllTileTasks();
 
   scoped_refptr<TileTask> CreateTaskSetFinishedTask(
       void (TileManager::*callback)());
-  std::vector<PrioritizedTile> AssignGpuMemoryToTiles();
 
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
   ScheduledTasksStateAsValue() const;
 
   TileManagerClient* client_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   ResourcePool* resource_pool_;
   TileTaskManager* tile_task_manager_;
   GlobalStateThatImpactsTilePriority global_state_;
   size_t scheduled_raster_task_limit_;
   const bool use_partial_raster_;
   bool use_gpu_rasterization_;
 
-  std::unordered_map<Tile::Id, Tile*> tiles_;
+  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_for_completed_tasks_since_last_schedule_tasks_;
   bool did_oom_on_last_assign_;
 
   ImageDecodeController* image_decode_controller_;
 
   RasterTaskCompletionStats flush_stats_;
@@ skipping 32 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_