Skip to content

Commit

Permalink
cc: Changed some perftest names that don't reflect functionality tested.
Browse files Browse the repository at this point in the history
This patch renames some perftests that better reflect the functionality
that they test.

R=danakj, enne

Review URL: https://codereview.chromium.org/816163002

Cr-Commit-Position: refs/heads/master@{#309347}
  • Loading branch information
vmpstr authored and Commit bot committed Dec 20, 2014
1 parent 03ac42d commit 4eef2d8
Showing 1 changed file with 12 additions and 31 deletions.
43 changes: 12 additions & 31 deletions cc/layers/picture_layer_impl_perftest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,8 @@ class PictureLayerImplPerfTest : public testing::Test {
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());

perf_test::PrintResult("layer_raster_tile_iterator_construct_and_iterate",
"",
test_name,
timer_.LapsPerSecond(),
"runs/s",
true);
perf_test::PrintResult("tiling_set_raster_queue_construct_and_iterate", "",
test_name, timer_.LapsPerSecond(), "runs/s", true);
}

void RunRasterQueueConstructTest(const std::string& test_name,
Expand All @@ -107,12 +103,8 @@ class PictureLayerImplPerfTest : public testing::Test {
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());

perf_test::PrintResult("layer_raster_tile_iterator_construct",
"",
test_name,
timer_.LapsPerSecond(),
"runs/s",
true);
perf_test::PrintResult("tiling_set_raster_queue_construct", "", test_name,
timer_.LapsPerSecond(), "runs/s", true);
}

void RunEvictionQueueConstructAndIterateTest(
Expand Down Expand Up @@ -140,11 +132,8 @@ class PictureLayerImplPerfTest : public testing::Test {
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());

perf_test::PrintResult("layer_eviction_tile_iterator_construct_and_iterate",
"",
test_name,
timer_.LapsPerSecond(),
"runs/s",
perf_test::PrintResult("tiling_set_eviction_queue_construct_and_iterate",
"", test_name, timer_.LapsPerSecond(), "runs/s",
true);
}

Expand All @@ -167,12 +156,8 @@ class PictureLayerImplPerfTest : public testing::Test {
timer_.NextLap();
} while (!timer_.HasTimeLimitExpired());

perf_test::PrintResult("layer_eviction_tile_iterator_construct",
"",
test_name,
timer_.LapsPerSecond(),
"runs/s",
true);
perf_test::PrintResult("tiling_set_eviction_queue_construct", "", test_name,
timer_.LapsPerSecond(), "runs/s", true);
}

protected:
Expand All @@ -186,8 +171,7 @@ class PictureLayerImplPerfTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(PictureLayerImplPerfTest);
};

// TODO(vmpstr): Rename these tests once the perf numbers are in.
TEST_F(PictureLayerImplPerfTest, LayerRasterTileIteratorConstructAndIterate) {
TEST_F(PictureLayerImplPerfTest, TilingSetRasterQueueConstructAndIterate) {
SetupPendingTree(gfx::Size(10000, 10000), gfx::Size(256, 256));

float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
Expand All @@ -204,8 +188,7 @@ TEST_F(PictureLayerImplPerfTest, LayerRasterTileIteratorConstructAndIterate) {
RunRasterQueueConstructAndIterateTest("64_500x500", 64, gfx::Size(500, 500));
}

// TODO(vmpstr): Rename these tests once the perf numbers are in.
TEST_F(PictureLayerImplPerfTest, LayerRasterTileIteratorConstruct) {
TEST_F(PictureLayerImplPerfTest, TilingSetRasterQueueConstruct) {
SetupPendingTree(gfx::Size(10000, 10000), gfx::Size(256, 256));

float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
Expand All @@ -221,8 +204,7 @@ TEST_F(PictureLayerImplPerfTest, LayerRasterTileIteratorConstruct) {
RunRasterQueueConstructTest("9999_0_100x100", gfx::Rect(9999, 0, 100, 100));
}

// TODO(e_hakkinen): Rename these tests once the perf numbers are in.
TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstructAndIterate) {
TEST_F(PictureLayerImplPerfTest, TilingSetEvictionQueueConstructAndIterate) {
SetupPendingTree(gfx::Size(10000, 10000), gfx::Size(256, 256));

float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
Expand All @@ -247,8 +229,7 @@ TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstructAndIterate) {
"64_500x500", 64, gfx::Size(500, 500));
}

// TODO(e_hakkinen): Rename these tests once the perf numbers are in.
TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstruct) {
TEST_F(PictureLayerImplPerfTest, TilingSetEvictionQueueConstruct) {
SetupPendingTree(gfx::Size(10000, 10000), gfx::Size(256, 256));

float low_res_factor = host_impl_.settings().low_res_contents_scale_factor;
Expand Down

0 comments on commit 4eef2d8

Please sign in to comment.