cc/resources/tile_manager_unittest.cc - Issue 19308003: Merge 210713 "cc: Remove tile ref counting in tile manager."

Unified Diff: cc/resources/tile_manager_unittest.cc

Issue 19308003: Merge 210713 "cc: Remove tile ref counting in tile manager." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 5 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

===================================================================

--- cc/resources/tile_manager_unittest.cc (revision 211727)

+++ cc/resources/tile_manager_unittest.cc (working copy)

@@ -146,7 +146,7 @@

3, TilePriorityForSoonBin(), TilePriorityForSoonBin());

TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(3, AssignedMemoryCounts(active_now));

EXPECT_EQ(3, AssignedMemoryCounts(pending_now));

@@ -174,7 +174,7 @@

3, TilePriorityForSoonBin(), TilePriorityForSoonBin());

TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(3, AssignedMemoryCounts(active_now));

EXPECT_EQ(3, AssignedMemoryCounts(pending_now));

@@ -201,7 +201,7 @@

3, TilePriorityForSoonBin(), TilePriorityForSoonBin());

TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(3, AssignedMemoryCounts(active_now));

EXPECT_EQ(3, AssignedMemoryCounts(pending_now));

@@ -228,7 +228,7 @@

3, TilePriorityForSoonBin(), TilePriorityForSoonBin());

TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(0, AssignedMemoryCounts(active_now));

EXPECT_EQ(0, AssignedMemoryCounts(pending_now));

@@ -254,7 +254,7 @@

TileVector pending_tree_tiles =

CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(3, AssignedMemoryCounts(active_tree_tiles));

EXPECT_EQ(5, AssignedMemoryCounts(pending_tree_tiles));

@@ -275,7 +275,7 @@

TileVector pending_tree_tiles =

CreateTiles(5, TilePriority(), TilePriorityForNowBin());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(5, AssignedMemoryCounts(active_tree_tiles));

EXPECT_EQ(3, AssignedMemoryCounts(pending_tree_tiles));

@@ -297,7 +297,7 @@

TileVector pending_tree_tiles =

CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(0, AssignedMemoryCounts(active_tree_tiles));

EXPECT_EQ(4, AssignedMemoryCounts(pending_tree_tiles));

@@ -319,7 +319,7 @@

TileVector pending_tree_tiles =

CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(0, AssignedMemoryCounts(active_tree_tiles));

EXPECT_EQ(4, AssignedMemoryCounts(pending_tree_tiles));

@@ -340,7 +340,7 @@

TileVector pending_tree_tiles =

CreateTiles(5, TilePriority(), TilePriorityForNowBin());

- tile_manager()->ManageTiles();

+ tile_manager()->AssignMemoryToTiles();

EXPECT_EQ(4, AssignedMemoryCounts(active_tree_tiles));

EXPECT_EQ(0, AssignedMemoryCounts(pending_tree_tiles));

« no previous file with comments | « cc/resources/tile_manager.cc ('k') | cc/test/fake_tile_manager.h » ('j') | no next file with comments »