Merge 210713 "cc: Remove tile ref counting in tile manager."

cc/resources/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 128 matching lines @@
 
   Initialize(10, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_now =
       CreateTiles(3, TilePriorityForNowBin(), TilePriority());
   TileVector pending_now =
       CreateTiles(3, TilePriority(), TilePriorityForNowBin());
   TileVector active_pending_soon = CreateTiles(
       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));
   EXPECT_EQ(3, AssignedMemoryCounts(active_pending_soon));
   EXPECT_EQ(0, AssignedMemoryCounts(never_bin));
 
   active_now.clear();
   pending_now.clear();
   active_pending_soon.clear();
   never_bin.clear();
 
   TearDown();
 }
 
 TEST_F(TileManagerTest, EnoughMemoryAllowPrepaintOnly) {
   // A few tiles of each type of priority, with enough memory for all tiles,
   // with the exception of never bin.
 
   Initialize(10, ALLOW_PREPAINT_ONLY, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_now =
       CreateTiles(3, TilePriorityForNowBin(), TilePriority());
   TileVector pending_now =
       CreateTiles(3, TilePriority(), TilePriorityForNowBin());
   TileVector active_pending_soon = CreateTiles(
       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));
   EXPECT_EQ(3, AssignedMemoryCounts(active_pending_soon));
   EXPECT_EQ(0, AssignedMemoryCounts(never_bin));
 
   active_now.clear();
   pending_now.clear();
   active_pending_soon.clear();
   never_bin.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, EnoughMemoryAllowAbsoluteMinimum) {
   // A few tiles of each type of priority, with enough memory for all tiles,
   // with the exception of never and soon bins.
 
   Initialize(10, ALLOW_ABSOLUTE_MINIMUM, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_now =
       CreateTiles(3, TilePriorityForNowBin(), TilePriority());
   TileVector pending_now =
       CreateTiles(3, TilePriority(), TilePriorityForNowBin());
   TileVector active_pending_soon = CreateTiles(
       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));
   EXPECT_EQ(0, AssignedMemoryCounts(active_pending_soon));
   EXPECT_EQ(0, AssignedMemoryCounts(never_bin));
 
   active_now.clear();
   pending_now.clear();
   active_pending_soon.clear();
   never_bin.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, EnoughMemoryAllowNothing) {
   // A few tiles of each type of priority, with enough memory for all tiles,
   // but allow nothing should not assign any memory.
 
   Initialize(10, ALLOW_NOTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_now =
       CreateTiles(3, TilePriorityForNowBin(), TilePriority());
   TileVector pending_now =
       CreateTiles(3, TilePriority(), TilePriorityForNowBin());
   TileVector active_pending_soon = CreateTiles(
       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));
   EXPECT_EQ(0, AssignedMemoryCounts(active_pending_soon));
   EXPECT_EQ(0, AssignedMemoryCounts(never_bin));
 
   active_now.clear();
   pending_now.clear();
   active_pending_soon.clear();
   never_bin.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, DISABLED_PartialOOMMemoryToPending) {
   // 5 tiles on active tree eventually bin, 5 tiles on pending tree that are
   // required for activation, but only enough memory for 8 tiles. The result
   // is all pending tree tiles get memory, and 3 of the active tree tiles
   // get memory.
 
   Initialize(8, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForEventualBin(), TilePriority());
   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));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, PartialOOMMemoryToActive) {
   // 5 tiles on active tree eventually bin, 5 tiles on pending tree now bin,
   // but only enough memory for 8 tiles. The result is all active tree tiles
   // get memory, and 3 of the pending tree tiles get memory.
 
   Initialize(8, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForNowBin(), TilePriority());
   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));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, DISABLED_TotalOOMMemoryToPending) {
   // 5 tiles on active tree eventually bin, 5 tiles on pending tree that are
   // required for activation, but only enough memory for 4 tiles. The result
   // is 4 pending tree tiles get memory, and none of the active tree tiles
   // get memory.
 
   Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForEventualBin(), TilePriority());
   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));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, DISABLED_TotalOOMActiveSoonMemoryToPending) {
   // 5 tiles on active tree soon bin, 5 tiles on pending tree that are
   // required for activation, but only enough memory for 4 tiles. The result
   // is 4 pending tree tiles get memory, and none of the active tree tiles
   // get memory.
 
   Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForSoonBin(), TilePriority());
   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));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 TEST_F(TileManagerTest, TotalOOMMemoryToActive) {
   // 5 tiles on active tree eventually bin, 5 tiles on pending tree now bin,
   // but only enough memory for 4 tiles. The result is 5 active tree tiles
   // get memory, and none of the pending tree tiles get memory.
 
   Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
   TileVector active_tree_tiles =
       CreateTiles(5, TilePriorityForNowBin(), TilePriority());
   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));
 
   pending_tree_tiles.clear();
   active_tree_tiles.clear();
   TearDown();
 }
 
 }  // namespace
 }  // namespace cc