cc: Do not cleanup tiles with raster tasks.

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/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
@@ skipping 27 matching lines @@
                                                   shared_bitmap_manager_.get(),
                                                   0,
                                                   false,
                                                   1,
                                                   false).Pass();
   }
 
   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_client_.set_tree(PENDING_TREE);
     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 RunInvalidateTest(const std::string& test_name, const Region& region) {
@@ skipping 70 matching lines @@
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
   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_client_.set_tree(ACTIVE_TREE);
     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_client_.set_tree(ACTIVE_TREE);
     picture_layer_tiling_->UpdateTilePriorities(
         ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
 
     timer_.Reset();
     do {
       int count = num_tiles;
       PictureLayerTiling::TilingRasterTileIterator it(
           picture_layer_tiling_.get(), ACTIVE_TREE);
       while (count--) {
         ASSERT_TRUE(it) << "count: " << count;
         ASSERT_TRUE(*it != NULL) << "count: " << count;
         ++it;
       }
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tiling_raster_tile_iterator_construct_and_iterate",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
   void RunEvictionIteratorConstructTest(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_client_.set_tree(ACTIVE_TREE);
     picture_layer_tiling_->UpdateTilePriorities(
         ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
 
     timer_.Reset();
     TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
                                  SMOOTHNESS_TAKES_PRIORITY,
                                  NEW_CONTENT_TAKES_PRIORITY};
     int priority_count = 0;
     do {
       PictureLayerTiling::TilingEvictionTileIterator it(
           picture_layer_tiling_.get(), priorities[priority_count]);
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tiling_eviction_tile_iterator_construct",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
   void RunEvictionIteratorConstructAndIterateTest(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_client_.set_tree(ACTIVE_TREE);
     picture_layer_tiling_->UpdateTilePriorities(
         ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
 
     TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
                                  SMOOTHNESS_TAKES_PRIORITY,
                                  NEW_CONTENT_TAKES_PRIORITY};
 
     // Ensure all tiles have resources.
     std::vector<Tile*> all_tiles = picture_layer_tiling_->AllTilesForTesting();
     for (std::vector<Tile*>::iterator tile_it = all_tiles.begin();
@@ skipping 121 matching lines @@
       "32_500x500", 32, gfx::Rect(0, 0, 500, 500));
   RunEvictionIteratorConstructAndIterateTest(
       "64_100x100", 64, gfx::Rect(0, 0, 100, 100));
   RunEvictionIteratorConstructAndIterateTest(
       "64_500x500", 64, gfx::Rect(0, 0, 500, 500));
 }
 
 }  // namespace
 
 }  // namespace cc