| Index: cc/resource_pool.cc
|
| diff --git a/cc/resource_pool.cc b/cc/resource_pool.cc
|
| index d82f62f3abd0b58a7358b17f34c5971338810145..7cff6ba4e68d9fd19e7be366b6360bccd2efb9f8 100644
|
| --- a/cc/resource_pool.cc
|
| +++ b/cc/resource_pool.cc
|
| @@ -34,7 +34,12 @@ ResourcePool::ResourcePool(ResourceProvider* resource_provider)
|
| }
|
|
|
| ResourcePool::~ResourcePool() {
|
| - SetMaxMemoryUsageBytes(0);
|
| + while (!resources_.empty()) {
|
| + Resource* resource = resources_.front();
|
| + resources_.pop_front();
|
| + memory_usage_bytes_ -= resource->bytes();
|
| + delete resource;
|
| + }
|
| }
|
|
|
| scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
|
| @@ -69,17 +74,4 @@ void ResourcePool::ReleaseResource(
|
| resources_.push_back(resource.release());
|
| }
|
|
|
| -void ResourcePool::SetMaxMemoryUsageBytes(size_t max_memory_usage_bytes) {
|
| - max_memory_usage_bytes_ = max_memory_usage_bytes;
|
| -
|
| - while (!resources_.empty()) {
|
| - if (memory_usage_bytes_ <= max_memory_usage_bytes_)
|
| - break;
|
| - Resource* resource = resources_.front();
|
| - resources_.pop_front();
|
| - memory_usage_bytes_ -= resource->bytes();
|
| - delete resource;
|
| - }
|
| -}
|
| -
|
| } // namespace cc
|
|
|