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

Unified Diff: cc/resources/tile_manager_unittest.cc

Issue 18581004: cc: Remove tile ref counting in tile manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 7 years, 6 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_manager_unittest.cc
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index 29e45ba7b6e75204c8180ad8eca88c8c8208bd06..a300cef3c301587a9591bcb702fb5b9000294845 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -158,7 +158,7 @@ TEST_F(TileManagerTest, EnoughMemoryAllowAnything) {
3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(3, AssignedMemoryCount(active_now));
EXPECT_EQ(3, AssignedMemoryCount(pending_now));
@@ -179,7 +179,7 @@ TEST_F(TileManagerTest, EnoughMemoryAllowPrepaintOnly) {
3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(3, AssignedMemoryCount(active_now));
EXPECT_EQ(3, AssignedMemoryCount(pending_now));
@@ -200,7 +200,7 @@ TEST_F(TileManagerTest, EnoughMemoryAllowAbsoluteMinimum) {
3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(3, AssignedMemoryCount(active_now));
EXPECT_EQ(3, AssignedMemoryCount(pending_now));
@@ -221,7 +221,7 @@ TEST_F(TileManagerTest, EnoughMemoryAllowNothing) {
3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(0, AssignedMemoryCount(active_now));
EXPECT_EQ(0, AssignedMemoryCount(pending_now));
@@ -241,7 +241,7 @@ TEST_F(TileManagerTest, PartialOOMMemoryToPending) {
TileVector pending_tree_tiles =
CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(5, AssignedMemoryCount(active_tree_tiles));
EXPECT_EQ(3, AssignedMemoryCount(pending_tree_tiles));
@@ -263,7 +263,7 @@ TEST_F(TileManagerTest, PartialOOMMemoryToActive) {
TileVector pending_tree_tiles =
CreateTiles(5, TilePriority(), TilePriorityForNowBin());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(5, AssignedMemoryCount(active_tree_tiles));
EXPECT_EQ(3, AssignedMemoryCount(pending_tree_tiles));
@@ -281,7 +281,7 @@ TEST_F(TileManagerTest, TotalOOMMemoryToPending) {
TileVector pending_tree_tiles =
CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(4, AssignedMemoryCount(active_tree_tiles));
EXPECT_EQ(0, AssignedMemoryCount(pending_tree_tiles));
@@ -304,7 +304,7 @@ TEST_F(TileManagerTest, TotalOOMActiveSoonMemoryToPending) {
TileVector pending_tree_tiles =
CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(4, AssignedMemoryCount(active_tree_tiles));
EXPECT_EQ(0, AssignedMemoryCount(pending_tree_tiles));
@@ -326,7 +326,7 @@ TEST_F(TileManagerTest, TotalOOMMemoryToActive) {
TileVector pending_tree_tiles =
CreateTiles(5, TilePriority(), TilePriorityForNowBin());
- tile_manager()->ManageTiles();
+ tile_manager()->AssignMemoryToTiles();
EXPECT_EQ(4, AssignedMemoryCount(active_tree_tiles));
EXPECT_EQ(0, AssignedMemoryCount(pending_tree_tiles));

Powered by Google App Engine
This is Rietveld 408576698