Remove limit on number of resources in cc

cc/resources/tile_manager.cc

Index: cc/resources/tile_manager.cc
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index 77c4df607639fd51e57cb22c35d6c344d618e200..79e3092caf62ba449328faf91197341a310d9161 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -547,12 +547,9 @@ void TileManager::AssignGpuMemoryToTiles(
   all_tiles_that_need_to_be_rasterized_are_scheduled_ = true;
   bool had_enough_memory_to_schedule_tiles_needed_now = true;
 
-  MemoryUsage hard_memory_limit(global_state_.hard_memory_limit_in_bytes,
-                                global_state_.num_resources_limit);
-  MemoryUsage soft_memory_limit(global_state_.soft_memory_limit_in_bytes,
-                                global_state_.num_resources_limit);
-  MemoryUsage memory_usage(resource_pool_->acquired_memory_usage_bytes(),
-                           resource_pool_->acquired_resource_count());
+  MemoryUsage hard_memory_limit(global_state_.hard_memory_limit_in_bytes);
+  MemoryUsage soft_memory_limit(global_state_.soft_memory_limit_in_bytes);
+  MemoryUsage memory_usage(resource_pool_->acquired_memory_usage_bytes());
 
   eviction_priority_queue_is_up_to_date_ = false;
   client_->BuildRasterQueue(&raster_priority_queue_,
@@ -877,18 +874,18 @@ void TileManager::CheckIfReadyToActivate() {
     client_->NotifyReadyToActivate();
 }
 
-TileManager::MemoryUsage::MemoryUsage() : memory_bytes_(0), resource_count_(0) {
+TileManager::MemoryUsage::MemoryUsage() : memory_bytes_(0) {
 }
 
-TileManager::MemoryUsage::MemoryUsage(int64 memory_bytes, int resource_count)
-    : memory_bytes_(memory_bytes), resource_count_(resource_count) {
+TileManager::MemoryUsage::MemoryUsage(int64 memory_bytes)
+    : memory_bytes_(memory_bytes) {
 }
 
 // static
 TileManager::MemoryUsage TileManager::MemoryUsage::FromConfig(
     const gfx::Size& size,
     ResourceFormat format) {
-  return MemoryUsage(Resource::MemorySizeBytes(size, format), 1);
+  return MemoryUsage(Resource::MemorySizeBytes(size, format));
 }
 
 // static
@@ -904,14 +901,12 @@ TileManager::MemoryUsage TileManager::MemoryUsage::FromTile(const Tile* tile) {
 TileManager::MemoryUsage& TileManager::MemoryUsage::operator+=(
     const MemoryUsage& other) {
   memory_bytes_ += other.memory_bytes_;
-  resource_count_ += other.resource_count_;
   return *this;
 }
 
 TileManager::MemoryUsage& TileManager::MemoryUsage::operator-=(
     const MemoryUsage& other) {
   memory_bytes_ -= other.memory_bytes_;
-  resource_count_ -= other.resource_count_;
   return *this;
 }
 
@@ -923,8 +918,7 @@ TileManager::MemoryUsage TileManager::MemoryUsage::operator-(
 }
 
 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const {
-  return memory_bytes_ > limit.memory_bytes_ ||
-         resource_count_ > limit.resource_count_;
+  return memory_bytes_ > limit.memory_bytes_;
 }
 
 }  // namespace cc