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

Unified Diff: cc/resources/tile_manager_perftest.cc

Issue 255533002: cc: Remove unused_memory_limit_in_bytes field from GlobalStateThatImpactsTilePriority. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/tile_manager.h ('k') | cc/resources/tile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_manager_perftest.cc
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
index 9a1642ae27cbfc6df66bdde06407dbaec3717015..bfe50e02c9da2a84e0666e859df737f02f51ab11 100644
--- a/cc/resources/tile_manager_perftest.cc
+++ b/cc/resources/tile_manager_perftest.cc
@@ -161,7 +161,12 @@ class TileManagerPerfTest : public testing::Test {
}
}
- tile_manager_->ManageTiles(GlobalStateForTest());
+ GlobalStateThatImpactsTilePriority global_state(GlobalStateForTest());
+ resource_pool_->SetResourceUsageLimits(
+ global_state.soft_memory_limit_in_bytes,
+ 0,
+ global_state.num_resources_limit);
+ tile_manager_->ManageTiles(global_state);
tile_manager_->UpdateVisibleTiles();
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());
@@ -218,11 +223,12 @@ class TileManagerTileIteratorPerfTest : public testing::Test,
state.soft_memory_limit_in_bytes = 100 * 1000 * 1000;
state.num_resources_limit = max_tiles_;
state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
- state.unused_memory_limit_in_bytes = state.soft_memory_limit_in_bytes;
state.memory_limit_policy = memory_limit_policy_;
state.tree_priority = tree_priority;
global_state_ = state;
+ host_impl_.resource_pool()->SetResourceUsageLimits(
+ state.soft_memory_limit_in_bytes, 0, state.num_resources_limit);
host_impl_.tile_manager()->SetGlobalStateForTesting(state);
}
« no previous file with comments | « cc/resources/tile_manager.h ('k') | cc/resources/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698