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

Unified Diff: cc/resources/tile_priority.cc

Issue 140673009: CC/GPU: Add a soft limit to the compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use CC Setting. Created 6 years, 10 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
Index: cc/resources/tile_priority.cc
diff --git a/cc/resources/tile_priority.cc b/cc/resources/tile_priority.cc
index 672a2f05b36a899d28f5114dea95fd685dd9b769..fcba343f1921f651d8df45d7bf181e7770db3b63 100644
--- a/cc/resources/tile_priority.cc
+++ b/cc/resources/tile_priority.cc
@@ -172,7 +172,8 @@ scoped_ptr<base::Value> GlobalStateThatImpactsTilePriority::AsValue() const {
scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
state->Set("memory_limit_policy",
TileMemoryLimitPolicyAsValue(memory_limit_policy).release());
- state->SetInteger("memory_limit_in_bytes", memory_limit_in_bytes);
+ state->SetInteger("soft_memory_limit_in_bytes", soft_memory_limit_in_bytes);
+ state->SetInteger("hard_memory_limit_in_bytes", hard_memory_limit_in_bytes);
state->SetInteger("unused_memory_limit_in_bytes",
unused_memory_limit_in_bytes);
state->SetInteger("num_resources_limit", num_resources_limit);

Powered by Google App Engine
This is Rietveld 408576698