cc: Simplify picture layer tiling update tile priorities.

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/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"
 
 namespace cc {
 
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
 class PictureLayerTilingPerfTest : public testing::Test {
  public:
   PictureLayerTilingPerfTest() : num_runs_(0) {}
 
   virtual void SetUp() OVERRIDE {
     picture_layer_tiling_client_.SetTileSize(gfx::Size(256, 256));
+    picture_layer_tiling_client_.set_max_tiles_for_interest_area(250);
     picture_layer_tiling_ = PictureLayerTiling::Create(
         1, gfx::Size(256 * 50, 256 * 50), &picture_layer_tiling_client_);
     picture_layer_tiling_->CreateAllTilesForTesting();
   }
 
   virtual void TearDown() OVERRIDE {
     picture_layer_tiling_.reset(NULL);
   }
 
   void EndTest() {
@@ skipping 19 matching lines @@
     start_time_ = base::TimeTicks();
     num_runs_ = 0;
     do {
       picture_layer_tiling_->Invalidate(region);
     } while (DidRun());
 
     perf_test::PrintResult("invalidation", "", test_name,
                            num_runs_ / elapsed_.InSecondsF(), "runs/s", true);
   }
 
-  void RunUpdateTilePrioritiesStationaryTest(
-      const std::string& test_name,
-      const gfx::Transform& transform) {
+  void RunUpdateTilePrioritiesStationaryTest(const std::string& test_name) {
     start_time_ = base::TimeTicks();
     num_runs_ = 0;
 
     gfx::Size layer_bounds(50 * 256, 50 * 256);
+    gfx::Rect viewport_rect(0, 0, 1024, 768);
     do {
       picture_layer_tiling_->UpdateTilePriorities(
-        ACTIVE_TREE,
-        layer_bounds,
-        gfx::Rect(layer_bounds),
-        gfx::Rect(layer_bounds),
-        layer_bounds,
-        layer_bounds,
-        1.f,
-        1.f,
-        transform,
-        transform,
-        num_runs_ + 1,
-        250);
+          ACTIVE_TREE, viewport_rect, 1.f, num_runs_ + 1);
     } while (DidRun());
 
-    perf_test::PrintResult("update_tile_priorities_stationary", "", test_name,
-                           num_runs_ / elapsed_.InSecondsF(), "runs/s", true);
+    perf_test::PrintResult("update_tile_priorities_stationary",
+                           "",
+                           test_name,
+                           num_runs_ / elapsed_.InSecondsF(),
+                           "runs/s",
+                           true);
   }
 
-  void RunUpdateTilePrioritiesScrollingTest(
-      const std::string& test_name,
-      const gfx::Transform& transform) {
+  void RunUpdateTilePrioritiesScrollingTest(const std::string& test_name) {
     start_time_ = base::TimeTicks();
     num_runs_ = 0;
 
     gfx::Size layer_bounds(50 * 256, 50 * 256);
     gfx::Size viewport_size(1024, 768);
     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;
     do {
       picture_layer_tiling_->UpdateTilePriorities(
-        ACTIVE_TREE,
-        viewport_size,
-        viewport_rect,
-        gfx::Rect(layer_bounds),
-        layer_bounds,
-        layer_bounds,
-        1.f,
-        1.f,
-        transform,
-        transform,
-        num_runs_ + 1,
-        250);
+          ACTIVE_TREE, viewport_rect, 1.f, num_runs_ + 1);
 
-      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[offsetIndex],
+                                viewport_rect.y() + yoffsets[offsetIndex],
+                                viewport_rect.width(),
+                                viewport_rect.height());
 
       if (++offsetCount > maxOffsetCount) {
         offsetCount = 0;
         offsetIndex = (offsetIndex + 1) % 4;
       }
     } while (DidRun());
 
-    perf_test::PrintResult("update_tile_priorities_scrolling", "", test_name,
-                           num_runs_ / elapsed_.InSecondsF(), "runs/s", true);
+    perf_test::PrintResult("update_tile_priorities_scrolling",
+                           "",
+                           test_name,
+                           num_runs_ / elapsed_.InSecondsF(),
+                           "runs/s",
+                           true);
   }
 
  private:
   FakePictureLayerTilingClient picture_layer_tiling_client_;
   scoped_ptr<PictureLayerTiling> picture_layer_tiling_;
 
   base::TimeTicks start_time_;
   base::TimeDelta elapsed_;
   int num_runs_;
 };
 
 TEST_F(PictureLayerTilingPerfTest, Invalidate) {
   Region one_tile(gfx::Rect(256, 256));
   RunInvalidateTest("1x1", one_tile);
 
   Region half_region(gfx::Rect(25 * 256, 50 * 256));
   RunInvalidateTest("25x50", half_region);
 
   Region full_region(gfx::Rect(50 * 256, 50 * 256));
   RunInvalidateTest("50x50", full_region);
 }
 
 #if defined(OS_ANDROID)
 // TODO(vmpstr): Investigate why this is noisy (crbug.com/310220).
 TEST_F(PictureLayerTilingPerfTest, DISABLED_UpdateTilePriorities) {
 #else
 TEST_F(PictureLayerTilingPerfTest, UpdateTilePriorities) {
 #endif  // defined(OS_ANDROID)
-  gfx::Transform transform;
-  RunUpdateTilePrioritiesStationaryTest("no_transform", transform);
-  RunUpdateTilePrioritiesScrollingTest("no_transform", transform);
-
-  transform.Rotate(10);
-  RunUpdateTilePrioritiesStationaryTest("rotation", transform);

[enne (OOO), 2014/02/11 00:43:56]

I think I maybe said remove this, but maybe leave these in so we can see how
much faster it gets here on bots.  Then they can be removed in a followup patch?

[vmpstr, 2014/02/11 23:45:25]

Done.

-  RunUpdateTilePrioritiesScrollingTest("rotation", transform);
-
-  transform.ApplyPerspectiveDepth(10);
-  RunUpdateTilePrioritiesStationaryTest("perspective", transform);
-  RunUpdateTilePrioritiesScrollingTest("perspective", transform);
+  RunUpdateTilePrioritiesStationaryTest("no_transform");
+  RunUpdateTilePrioritiesScrollingTest("no_transform");
 }
 
 }  // namespace
 
 }  // namespace cc