Remove limit on number of resources in cc

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 6f579f9fb1c9dde8baa82cd233604482f0e00f5f..8c7567d52a3023ef27b908cad92b25914a83e345 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -188,26 +188,6 @@ class CC_EXPORT TileManager : public RasterizerClient,
   void AssignGpuMemoryToTiles(TileVector* tiles_that_need_to_be_rasterized);
 
  private:
-  class MemoryUsage {
-   public:
-    MemoryUsage();
-    MemoryUsage(int64 memory_bytes, int resource_count);
-
-    static MemoryUsage FromConfig(const gfx::Size& size, ResourceFormat format);
-    static MemoryUsage FromTile(const Tile* tile);
-
-    MemoryUsage& operator+=(const MemoryUsage& other);
-    MemoryUsage& operator-=(const MemoryUsage& other);
-    MemoryUsage operator-(const MemoryUsage& other);
-
-    bool Exceeds(const MemoryUsage& limit) const;
-    int64 memory_bytes() const { return memory_bytes_; }
-
-   private:
-    int64 memory_bytes_;
-    int resource_count_;
-  };
-
   void OnImageDecodeTaskCompleted(int layer_id,
                                   SkPixelRef* pixel_ref,
                                   bool was_canceled);
@@ -223,15 +203,16 @@ class CC_EXPORT TileManager : public RasterizerClient,
   scoped_refptr<RasterTask> CreateRasterTask(Tile* tile);
 
   void RebuildEvictionQueueIfNeeded();
-  bool FreeTileResourcesUntilUsageIsWithinLimit(const MemoryUsage& limit,
-                                                MemoryUsage* usage);
+  bool FreeTileResourcesUntilUsageIsWithinLimit(int64 limit, int64* usage);
   bool FreeTileResourcesWithLowerPriorityUntilUsageIsWithinLimit(
-      const MemoryUsage& limit,
+      int64 limit,
       const TilePriority& oother_priority,
-      MemoryUsage* usage);
+      int64* usage);
   bool TilePriorityViolatesMemoryPolicy(const TilePriority& priority);
   bool IsReadyToActivate() const;
   void CheckIfReadyToActivate();
+  int64 BytesLimitFromConfig(const gfx::Size& size, ResourceFormat format);

[reveman, 2014/10/27 13:39:00]

MemoryUsageFromConfig?

[boliu, 2014/10/27 15:35:57]

Done.

+  int64 BytesLimitFromTile(const Tile* tile);

[reveman, 2014/10/27 13:39:00]

MemoryUsageFromTile?

[boliu, 2014/10/27 15:35:57]

Done.

 
   TileManagerClient* client_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;