cc: Add tiling raster tile iterator construction perftest.

cc/resources/picture_layer_tiling_perftest.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/debug/lap_timer.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "cc/test/fake_picture_layer_tiling_client.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
@@ skipping 94 matching lines @@
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("update_tile_priorities_scrolling",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
-  void RunTilingRasterTileIteratorTest(const std::string& test_name,
-                                       int num_tiles,
-                                       const gfx::Rect& viewport) {
+  void RunRasterIteratorConstructTest(const std::string& test_name,
+                                      const gfx::Rect& viewport) {
+    gfx::Size bounds(viewport.size());
+    picture_layer_tiling_ =
+        PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
+    picture_layer_tiling_->UpdateTilePriorities(
+        ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
+
+    timer_.Reset();
+    do {
+      PictureLayerTiling::TilingRasterTileIterator it(
+          picture_layer_tiling_.get(), ACTIVE_TREE);
+      timer_.NextLap();
+    } while (!timer_.HasTimeLimitExpired());
+
+    perf_test::PrintResult("tiling_raster_tile_iterator_construct",
+                           "",
+                           test_name,
+                           timer_.LapsPerSecond(),
+                           "runs/s",
+                           true);
+  }
+
+  void RunRasterIteratorConstructAndIterateTest(const std::string& test_name,
+                                                int num_tiles,
+                                                const gfx::Rect& viewport) {
     gfx::Size bounds(10000, 10000);
     picture_layer_tiling_ =
         PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
     picture_layer_tiling_->UpdateTilePriorities(
         ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
 
     timer_.Reset();
     do {
       int count = num_tiles;
-      for (PictureLayerTiling::TilingRasterTileIterator it(
-               picture_layer_tiling_.get(), ACTIVE_TREE);
-           it && count;
-           ++it) {
+      PictureLayerTiling::TilingRasterTileIterator it(
+          picture_layer_tiling_.get(), ACTIVE_TREE);
+      ASSERT_TRUE(it);
+      for (; it && count; ++it) {

[reveman, 2014/07/17 16:16:15]

nit: maybe a bit easier to read if you just use one variable to determine when
to stop iterating. ie.

while (count--) {
  ASSERT_TRUE(it);
  ++it;
}

also consider adding a ASSERT_TRUE(*it != NULL) to the loop to ensure that the
test stays valid if we ever make bool() operator cheaper than actually getting
the Tile.

[vmpstr, 2014/07/17 16:33:36]

Done.

         --count;
       }
+      ASSERT_EQ(0, count);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
-    perf_test::PrintResult("tiling_raster_tile_iterator",
+    perf_test::PrintResult("tiling_raster_tile_iterator_construct_and_iterate",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
  private:
   FakePictureLayerTilingClient picture_layer_tiling_client_;
   scoped_ptr<PictureLayerTiling> picture_layer_tiling_;
@@ skipping 25 matching lines @@
 
   transform.Rotate(10);
   RunUpdateTilePrioritiesStationaryTest("rotation", transform);
   RunUpdateTilePrioritiesScrollingTest("rotation", transform);
 
   transform.ApplyPerspectiveDepth(10);
   RunUpdateTilePrioritiesStationaryTest("perspective", transform);
   RunUpdateTilePrioritiesScrollingTest("perspective", transform);
 }
 
-TEST_F(PictureLayerTilingPerfTest, TilingRasterTileIterator) {
-  RunTilingRasterTileIteratorTest("32_100x100", 32, gfx::Rect(0, 0, 100, 100));
-  RunTilingRasterTileIteratorTest("32_500x500", 32, gfx::Rect(0, 0, 500, 500));
-  RunTilingRasterTileIteratorTest("64_100x100", 64, gfx::Rect(0, 0, 100, 100));
-  RunTilingRasterTileIteratorTest("64_500x500", 64, gfx::Rect(0, 0, 500, 500));
+TEST_F(PictureLayerTilingPerfTest, TilingRasterTileIteratorConstruct) {
+  RunRasterIteratorConstructTest("0_0_100x100", gfx::Rect(0, 0, 100, 100));
+  RunRasterIteratorConstructTest("50_0_100x100", gfx::Rect(50, 0, 100, 100));
+  RunRasterIteratorConstructTest("100_0_100x100", gfx::Rect(100, 0, 100, 100));
+  RunRasterIteratorConstructTest("150_0_100x100", gfx::Rect(150, 0, 100, 100));
+}
+
+TEST_F(PictureLayerTilingPerfTest,
+       TilingRasterTileIteratorConstructAndIterate) {
+  RunRasterIteratorConstructAndIterateTest(
+      "32_100x100", 32, gfx::Rect(0, 0, 100, 100));
+  RunRasterIteratorConstructAndIterateTest(
+      "32_500x500", 32, gfx::Rect(0, 0, 500, 500));
+  RunRasterIteratorConstructAndIterateTest(
+      "64_100x100", 64, gfx::Rect(0, 0, 100, 100));
+  RunRasterIteratorConstructAndIterateTest(
+      "64_500x500", 64, gfx::Rect(0, 0, 500, 500));
 }
 
 }  // namespace
 
 }  // namespace cc