Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4726)

Unified Diff: cc/resources/resource_pool.cc

Issue 12502016: cc: Add command line switch to control resource usage for impl-side painting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/resource_pool.h ('k') | cc/resources/tile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_pool.cc
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 3cd45d8d5d7d8d6f180900981adc4e3ea6f4e122..9f553c266537fcfdee69527eed8f495482ea39c9 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -30,11 +30,13 @@ ResourcePool::Resource::~Resource() {
ResourcePool::ResourcePool(ResourceProvider* resource_provider)
: resource_provider_(resource_provider),
max_memory_usage_bytes_(0),
- memory_usage_bytes_(0) {
+ max_unused_memory_usage_bytes_(0),
+ memory_usage_bytes_(0),
+ unused_memory_usage_bytes_(0) {
}
ResourcePool::~ResourcePool() {
- SetMaxMemoryUsageBytes(0);
+ SetMaxMemoryUsageBytes(0, 0);
}
scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
@@ -55,6 +57,7 @@ scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
continue;
resources_.erase(it);
+ unused_memory_usage_bytes_ -= resource->bytes();
return make_scoped_ptr(resource);
}
@@ -73,25 +76,41 @@ scoped_ptr<ResourcePool::Resource> ResourcePool::AcquireResource(
void ResourcePool::ReleaseResource(
scoped_ptr<ResourcePool::Resource> resource) {
- if (memory_usage_bytes_ > max_memory_usage_bytes_) {
+ if (MemoryUsageTooHigh()) {
memory_usage_bytes_ -= resource->bytes();
return;
}
+ unused_memory_usage_bytes_ += resource->bytes();
resources_.push_back(resource.release());
}
-void ResourcePool::SetMaxMemoryUsageBytes(size_t max_memory_usage_bytes) {
+void ResourcePool::SetMaxMemoryUsageBytes(
+ 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;
while (!resources_.empty()) {
- if (memory_usage_bytes_ <= max_memory_usage_bytes_)
+ if (!MemoryUsageTooHigh())
break;
- Resource* resource = resources_.front();
- resources_.pop_front();
+
+ // MRU eviction pattern as least recently used is less likely to
+ // be blocked by read lock fence.
+ Resource* resource = resources_.back();
+ resources_.pop_back();
memory_usage_bytes_ -= resource->bytes();
+ unused_memory_usage_bytes_ -= resource->bytes();
delete resource;
}
}
+bool ResourcePool::MemoryUsageTooHigh() {
+ if (memory_usage_bytes_ > max_memory_usage_bytes_)
+ return true;
+ if (unused_memory_usage_bytes_ > max_unused_memory_usage_bytes_)
+ return true;
+ return false;
+}
+
} // namespace cc
« no previous file with comments | « cc/resources/resource_pool.h ('k') | cc/resources/tile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698