diff options
| -rw-r--r-- | cc/resources/picture_layer_tiling_perftest.cc | 19 | ||||
| -rw-r--r-- | cc/resources/picture_layer_tiling_set_unittest.cc | 29 |
2 files changed, 23 insertions, 25 deletions
diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc index 4db7fe6..4dcfe44 100644 --- a/cc/resources/picture_layer_tiling_perftest.cc +++ b/cc/resources/picture_layer_tiling_perftest.cc @@ -99,23 +99,22 @@ class PictureLayerTilingPerfTest : public testing::Test { gfx::Rect viewport_rect(viewport_size); int xoffsets[] = {10, 0, -10, 0}; int yoffsets[] = {0, 10, 0, -10}; - int offsetIndex = 0; - int offsetCount = 0; - const int maxOffsetCount = 1000; + int offset_index = 0; + int offset_count = 0; + const int max_offset_count = 1000; timer_.Reset(); do { picture_layer_tiling_->ComputeTilePriorityRects( viewport_rect, 1.f, timer_.NumLaps() + 1, Occlusion()); - viewport_rect = gfx::Rect(viewport_rect.x() + xoffsets[offsetIndex], - viewport_rect.y() + yoffsets[offsetIndex], - viewport_rect.width(), - viewport_rect.height()); + viewport_rect = gfx::Rect(viewport_rect.x() + xoffsets[offset_index], + viewport_rect.y() + yoffsets[offset_index], + viewport_rect.width(), viewport_rect.height()); - if (++offsetCount > maxOffsetCount) { - offsetCount = 0; - offsetIndex = (offsetIndex + 1) % 4; + if (++offset_count > max_offset_count) { + offset_count = 0; + offset_index = (offset_index + 1) % 4; } timer_.NextLap(); } while (!timer_.HasTimeLimitExpired()); diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc index 7c68611..3150403 100644 --- a/cc/resources/picture_layer_tiling_set_unittest.cc +++ b/cc/resources/picture_layer_tiling_set_unittest.cc @@ -201,12 +201,11 @@ TEST(PictureLayerTilingSetTest, TilingRange) { class PictureLayerTilingSetTestWithResources : public testing::Test { public: - void runTest( - int num_tilings, - float min_scale, - float scale_increment, - float ideal_contents_scale, - float expected_scale) { + void RunTest(int num_tilings, + float min_scale, + float scale_increment, + float ideal_contents_scale, + float expected_scale) { FakeOutputSurfaceClient output_surface_client; scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d(); @@ -266,36 +265,36 @@ class PictureLayerTilingSetTestWithResources : public testing::Test { }; TEST_F(PictureLayerTilingSetTestWithResources, NoTilings) { - runTest(0, 0.f, 0.f, 2.f, 0.f); + RunTest(0, 0.f, 0.f, 2.f, 0.f); } TEST_F(PictureLayerTilingSetTestWithResources, OneTiling_Smaller) { - runTest(1, 1.f, 0.f, 2.f, 1.f); + RunTest(1, 1.f, 0.f, 2.f, 1.f); } TEST_F(PictureLayerTilingSetTestWithResources, OneTiling_Larger) { - runTest(1, 3.f, 0.f, 2.f, 3.f); + RunTest(1, 3.f, 0.f, 2.f, 3.f); } TEST_F(PictureLayerTilingSetTestWithResources, TwoTilings_Smaller) { - runTest(2, 1.f, 1.f, 3.f, 2.f); + RunTest(2, 1.f, 1.f, 3.f, 2.f); } TEST_F(PictureLayerTilingSetTestWithResources, TwoTilings_SmallerEqual) { - runTest(2, 1.f, 1.f, 2.f, 2.f); + RunTest(2, 1.f, 1.f, 2.f, 2.f); } TEST_F(PictureLayerTilingSetTestWithResources, TwoTilings_LargerEqual) { - runTest(2, 1.f, 1.f, 1.f, 1.f); + RunTest(2, 1.f, 1.f, 1.f, 1.f); } TEST_F(PictureLayerTilingSetTestWithResources, TwoTilings_Larger) { - runTest(2, 2.f, 8.f, 1.f, 2.f); + RunTest(2, 2.f, 8.f, 1.f, 2.f); } TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_Equal) { - runTest(10, 1.f, 1.f, 5.f, 5.f); + RunTest(10, 1.f, 1.f, 5.f, 5.f); } TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_NotEqual) { - runTest(10, 1.f, 1.f, 4.5f, 5.f); + RunTest(10, 1.f, 1.f, 4.5f, 5.f); } TEST(PictureLayerTilingSetTest, TileSizeChange) { |