Remove limit on number of resources in cc

cc/resources/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_RESOURCES_TILE_MANAGER_H_
 #define CC_RESOURCES_TILE_MANAGER_H_
 
 #include <deque>
 #include <queue>
 #include <set>
@@ skipping 170 matching lines @@
   typedef std::vector<Tile*> TileVector;
   typedef std::set<Tile*> TileSet;
 
   // Virtual for test
   virtual void ScheduleTasks(
       const TileVector& tiles_that_need_to_be_rasterized);
 
   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);
   void OnRasterTaskCompleted(Tile::Id tile,
                              scoped_ptr<ScopedResource> resource,
                              const PicturePileImpl::Analysis& analysis,
                              bool was_canceled);
 
   void FreeResourcesForTile(Tile* tile);
   void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
   scoped_refptr<ImageDecodeTask> CreateImageDecodeTask(Tile* tile,
                                                        SkPixelRef* pixel_ref);
   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_;
   ResourcePool* resource_pool_;
   Rasterizer* rasterizer_;
   GlobalStateThatImpactsTilePriority global_state_;
   const size_t scheduled_raster_task_limit_;
 
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
@@ skipping 31 matching lines @@
   RasterTilePriorityQueue raster_priority_queue_;
   EvictionTilePriorityQueue eviction_priority_queue_;
   bool eviction_priority_queue_is_up_to_date_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_