| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index 2204ab808d17f2a793a7f615488811d7253500a3..ffbedfd0a38450810e680accadfdd4f9449358ba 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -392,9 +392,9 @@ class TileManagerPerfTest : public testing::Test {
|
| return state;
|
| }
|
|
|
| - void RunManageTilesTest(const std::string& test_name,
|
| - int layer_count,
|
| - int approximate_tile_count_per_layer) {
|
| + void RunPrepareTilesTest(const std::string& test_name,
|
| + int layer_count,
|
| + int approximate_tile_count_per_layer) {
|
| std::vector<LayerImpl*> layers =
|
| CreateLayers(layer_count, approximate_tile_count_per_layer);
|
| timer_.Reset();
|
| @@ -408,14 +408,14 @@ class TileManagerPerfTest : public testing::Test {
|
| }
|
|
|
| GlobalStateThatImpactsTilePriority global_state(GlobalStateForTest());
|
| - tile_manager()->ManageTiles(global_state);
|
| + tile_manager()->PrepareTiles(global_state);
|
| tile_manager()->UpdateVisibleTiles();
|
| timer_.NextLap();
|
| host_impl_.ResetCurrentBeginFrameArgsForNextFrame();
|
| } while (!timer_.HasTimeLimitExpired());
|
|
|
| - perf_test::PrintResult(
|
| - "manage_tiles", "", test_name, timer_.LapsPerSecond(), "runs/s", true);
|
| + perf_test::PrintResult("prepare_tiles", "", test_name,
|
| + timer_.LapsPerSecond(), "runs/s", true);
|
| }
|
|
|
| TileManager* tile_manager() { return host_impl_.tile_manager(); }
|
| @@ -439,16 +439,16 @@ class TileManagerPerfTest : public testing::Test {
|
|
|
| const gfx::Size TileManagerPerfTest::kDefaultTileSize(100, 100);
|
|
|
| -TEST_F(TileManagerPerfTest, ManageTiles) {
|
| - RunManageTilesTest("2_100", 2, 100);
|
| - RunManageTilesTest("2_500", 2, 500);
|
| - RunManageTilesTest("2_1000", 2, 1000);
|
| - RunManageTilesTest("10_100", 10, 100);
|
| - RunManageTilesTest("10_500", 10, 500);
|
| - RunManageTilesTest("10_1000", 10, 1000);
|
| - RunManageTilesTest("50_100", 100, 100);
|
| - RunManageTilesTest("50_500", 100, 500);
|
| - RunManageTilesTest("50_1000", 100, 1000);
|
| +TEST_F(TileManagerPerfTest, PrepareTiles) {
|
| + RunPrepareTilesTest("2_100", 2, 100);
|
| + RunPrepareTilesTest("2_500", 2, 500);
|
| + RunPrepareTilesTest("2_1000", 2, 1000);
|
| + RunPrepareTilesTest("10_100", 10, 100);
|
| + RunPrepareTilesTest("10_500", 10, 500);
|
| + RunPrepareTilesTest("10_1000", 10, 1000);
|
| + RunPrepareTilesTest("50_100", 100, 100);
|
| + RunPrepareTilesTest("50_500", 100, 500);
|
| + RunPrepareTilesTest("50_1000", 100, 1000);
|
| }
|
|
|
| TEST_F(TileManagerPerfTest, RasterTileQueueConstruct) {
|
|
|