| Index: cc/resources/resource_pool.cc
|
| diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
|
| index 31b9b272013989ced09e369921056b3d988da66b..905c1527f71aa09b938957732a69691a17ff7728 100644
|
| --- a/cc/resources/resource_pool.cc
|
| +++ b/cc/resources/resource_pool.cc
|
| @@ -17,7 +17,6 @@ ResourcePool::ResourcePool(ResourceProvider* resource_provider,
|
| format_(format),
|
| max_memory_usage_bytes_(0),
|
| max_unused_memory_usage_bytes_(0),
|
| - max_resource_count_(0),
|
| memory_usage_bytes_(0),
|
| unused_memory_usage_bytes_(0),
|
| resource_count_(0) {}
|
| @@ -28,7 +27,7 @@ ResourcePool::~ResourcePool() {
|
| busy_resources_.pop_front();
|
| }
|
|
|
| - SetResourceUsageLimits(0, 0, 0);
|
| + SetResourceUsageLimits(0, 0);
|
| DCHECK_EQ(0u, unused_resources_.size());
|
| DCHECK_EQ(0u, memory_usage_bytes_);
|
| DCHECK_EQ(0u, unused_memory_usage_bytes_);
|
| @@ -64,12 +63,11 @@ void ResourcePool::ReleaseResource(scoped_ptr<ScopedResource> resource) {
|
| busy_resources_.push_back(resource.release());
|
| }
|
|
|
| -void ResourcePool::SetResourceUsageLimits(size_t max_memory_usage_bytes,
|
| - size_t max_unused_memory_usage_bytes,
|
| - size_t max_resource_count) {
|
| +void ResourcePool::SetResourceUsageLimits(
|
| + size_t max_memory_usage_bytes,
|
| + size_t max_unused_memory_usage_bytes) {
|
| max_memory_usage_bytes_ = max_memory_usage_bytes;
|
| max_unused_memory_usage_bytes_ = max_unused_memory_usage_bytes;
|
| - max_resource_count_ = max_resource_count;
|
|
|
| ReduceResourceUsage();
|
| }
|
| @@ -96,8 +94,6 @@ void ResourcePool::ReduceResourceUsage() {
|
| }
|
|
|
| bool ResourcePool::ResourceUsageTooHigh() {
|
| - if (resource_count_ > max_resource_count_)
|
| - return true;
|
| if (memory_usage_bytes_ > max_memory_usage_bytes_)
|
| return true;
|
| if (unused_memory_usage_bytes_ > max_unused_memory_usage_bytes_)
|
|
|