cc: Start using raster/eviction iterators in tile manager

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 30f4730423e9ce616c61a614c287b38897752bf9..ecd9449f0c47bdf22f6bdb83c3420a989f680cb3 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -21,7 +21,6 @@
 #include "cc/resources/managed_tile_state.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/picture_pile_impl.h"
-#include "cc/resources/prioritized_tile_set.h"
 #include "cc/resources/rasterizer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
@@ -224,10 +223,7 @@ class CC_EXPORT TileManager : public RasterizerClient,
       const GlobalStateThatImpactsTilePriority& state) {
     // Soft limit is used for resource pool such that
     // memory returns to soft limit after going over.

[reveman, 2014/06/14 14:53:25]

not sure what this comment does here. doesn't make sense to me in this context.
can you remove it in this patch unless there's a good reason for it to be here?

[vmpstr, 2014/06/16 18:18:19]

Yeah, I'm not sure what this comment means here. Removed.

-    if (state != global_state_) {
-      global_state_ = state;
-      prioritized_tiles_dirty_ = true;
-    }
+    global_state_ = state;
   }
 
   void SetRasterizerForTesting(Rasterizer* rasterizer);
@@ -241,13 +237,10 @@ class CC_EXPORT TileManager : public RasterizerClient,
               Rasterizer* rasterizer,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
-  // Methods called by Tile
-  friend class Tile;
-  void DidChangeTilePriority(Tile* tile);
-
   void CleanUpReleasedTiles();
 
   // Overriden from RefCountedManager<Tile>:
+  friend class Tile;
   virtual void Release(Tile* tile) OVERRIDE;
 
   // Overriden from RasterizerClient:
@@ -262,11 +255,21 @@ class CC_EXPORT TileManager : public RasterizerClient,
   virtual void ScheduleTasks(
       const TileVector& tiles_that_need_to_be_rasterized);
 
-  void AssignGpuMemoryToTiles(PrioritizedTileSet* tiles,
-                              TileVector* tiles_that_need_to_be_rasterized);
-  void GetTilesWithAssignedBins(PrioritizedTileSet* tiles);
+  void AssignGpuMemoryToTiles(TileVector* tiles_that_need_to_be_rasterized);
 
  private:
+  struct MemoryBudget {
+    int64 soft_memory_bytes;
+    int64 hard_memory_bytes;
+    int resource_count;
+
+    bool Exceeds(const MemoryBudget& other) const {
+      return soft_memory_bytes > other.soft_memory_bytes ||
+             hard_memory_bytes > other.hard_memory_bytes ||
+             resource_count > other.resource_count;
+    }
+  };
+
   void OnImageDecodeTaskCompleted(int layer_id,
                                   SkPixelRef* pixel_ref,
                                   bool was_canceled);
@@ -289,8 +292,14 @@ class CC_EXPORT TileManager : public RasterizerClient,
                                                        SkPixelRef* pixel_ref);
   scoped_refptr<RasterTask> CreateRasterTask(Tile* tile);
   scoped_ptr<base::Value> GetMemoryRequirementsAsValue() const;
-  void UpdatePrioritizedTileSetIfNeeded();
 
+  bool FreeTileResourcesUntilUsageIsWithinBudget(
+      EvictionTileIterator* eviction_iterator,
+      const MemoryBudget& required_budget,
+      MemoryBudget* current_budget,
+      const TilePriority& max_priority,
+      bool evict_unconditionally);

[reveman, 2014/06/14 14:53:25]

The return value of this function seem to be unused. Can we remove it?

[vmpstr, 2014/06/16 18:18:19]

Done.

+  bool TilePriorityViolatesMemoryPolicy(const TilePriority& priority);
   bool IsReadyToActivate() const;
   void CheckIfReadyToActivate();
 
@@ -303,17 +312,12 @@ class CC_EXPORT TileManager : public RasterizerClient,
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
 
-  PrioritizedTileSet prioritized_tiles_;
-  bool prioritized_tiles_dirty_;
-
   bool all_tiles_that_need_to_be_rasterized_have_memory_;
   bool all_tiles_required_for_activation_have_memory_;
 
-  size_t memory_required_bytes_;
-  size_t memory_nice_to_have_bytes_;
-
   size_t bytes_releasable_;
   size_t resources_releasable_;
+  size_t bytes_required_but_not_allocated_;
 
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;