Revert "cc: Added tile bundles"

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 "cc/test/fake_tile_manager.h"
-#include "cc/test/fake_tile_manager_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) {
-    tile_manager_ = make_scoped_ptr(new FakeTileManager(&tile_manager_client_));
-    picture_layer_tiling_client_ =
-        make_scoped_ptr(new FakePictureLayerTilingClient(tile_manager_.get()));
-  }
+  PictureLayerTilingPerfTest() : num_runs_(0) {}
 
   virtual void SetUp() OVERRIDE {
-    picture_layer_tiling_client_->SetTileSize(gfx::Size(256, 256));
+    picture_layer_tiling_client_.SetTileSize(gfx::Size(256, 256));
     picture_layer_tiling_ = PictureLayerTiling::Create(
-        1, gfx::Size(256 * 50, 256 * 50), picture_layer_tiling_client_.get());
-    picture_layer_tiling_->CreateTilesForTesting(PENDING_TREE);
+        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() {
     elapsed_ = base::TimeTicks::HighResNow() - start_time_;
   }
 
@@ skipping 25 matching lines @@
 
   void RunUpdateTilePrioritiesStationaryTest(
       const std::string& test_name,
       const gfx::Transform& transform) {
     start_time_ = base::TimeTicks();
     num_runs_ = 0;
 
     gfx::Size layer_bounds(50 * 256, 50 * 256);
     do {
       picture_layer_tiling_->UpdateTilePriorities(
-        PENDING_TREE,
+        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,
@@ skipping 13 matching lines @@
     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(
-        PENDING_TREE,
+        ACTIVE_TREE,
         viewport_size,
         viewport_rect,
         gfx::Rect(layer_bounds),
         layer_bounds,
         layer_bounds,
         1.f,
         1.f,
         transform,
         transform,
         num_runs_ + 1,
         250);
 
       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);
   }
 
  private:
-  FakeTileManagerClient tile_manager_client_;
-  scoped_ptr<FakeTileManager> tile_manager_;
-  scoped_ptr<FakePictureLayerTilingClient> picture_layer_tiling_client_;
+  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);
@@ skipping 20 matching lines @@
   RunUpdateTilePrioritiesScrollingTest("rotation", transform);
 
   transform.ApplyPerspectiveDepth(10);
   RunUpdateTilePrioritiesStationaryTest("perspective", transform);
   RunUpdateTilePrioritiesScrollingTest("perspective", transform);
 }
 
 }  // namespace
 
 }  // namespace cc