cc: Rework how picture layer tiling set gets into raster queues.

cc/resources/tile_manager_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 "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/resources/raster_buffer.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/begin_frame_args_test.h"
@@ skipping 165 matching lines @@
                                  NEW_CONTENT_TAKES_PRIORITY};
     int priority_count = 0;
 
     std::vector<FakePictureLayerImpl*> layers = CreateLayers(layer_count, 10);
     bool resourceless_software_draw = false;
     for (const auto& layer : layers)
       layer->UpdateTiles(Occlusion(), resourceless_software_draw);
 
     timer_.Reset();
     do {
-      scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
-          priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
+      scoped_ptr<RasterTilePriorityQueue> queue(
+          host_impl_.tile_manager()->BuildRasterQueue(
+              RasterTilePriorityQueue::Type::ALL));
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tile_manager_raster_tile_queue_construct",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
   void RunRasterQueueConstructAndIterateTest(const std::string& test_name,
                                              int layer_count,
                                              int tile_count) {
     TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
                                  SMOOTHNESS_TAKES_PRIORITY,
                                  NEW_CONTENT_TAKES_PRIORITY};
 
     std::vector<FakePictureLayerImpl*> layers = CreateLayers(layer_count, 100);
     bool resourceless_software_draw = false;
     for (const auto& layer : layers)
       layer->UpdateTiles(Occlusion(), resourceless_software_draw);
 
     int priority_count = 0;
     timer_.Reset();
     do {
       int count = tile_count;
-      scoped_ptr<RasterTilePriorityQueue> queue(host_impl_.BuildRasterQueue(
-          priorities[priority_count], RasterTilePriorityQueue::Type::ALL));
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
+      scoped_ptr<RasterTilePriorityQueue> queue(
+          host_impl_.tile_manager()->BuildRasterQueue(
+              RasterTilePriorityQueue::Type::ALL));
       while (count--) {
         ASSERT_FALSE(queue->IsEmpty());
         ASSERT_TRUE(queue->Top() != NULL);
         queue->Pop();
       }
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult(
@@ skipping 17 matching lines @@
     for (const auto& layer : layers) {
       layer->UpdateTiles(Occlusion(), resourceless_software_draw);
       for (size_t i = 0; i < layer->num_tilings(); ++i) {
         tile_manager()->InitializeTilesWithResourcesForTesting(
             layer->tilings()->tiling_at(i)->AllTilesForTesting());
       }
     }
 
     timer_.Reset();
     do {
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
       scoped_ptr<EvictionTilePriorityQueue> queue(
-          host_impl_.BuildEvictionQueue(priorities[priority_count]));
+          host_impl_.tile_manager()->BuildEvictionQueue());
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tile_manager_eviction_tile_queue_construct",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
@@ skipping 14 matching lines @@
       layer->UpdateTiles(Occlusion(), resourceless_software_draw);
       for (size_t i = 0; i < layer->num_tilings(); ++i) {
         tile_manager()->InitializeTilesWithResourcesForTesting(
             layer->tilings()->tiling_at(i)->AllTilesForTesting());
       }
     }
 
     timer_.Reset();
     do {
       int count = tile_count;
+      global_state_.tree_priority = priorities[priority_count];
+      host_impl_.tile_manager()->SetGlobalStateForTesting(global_state_);
       scoped_ptr<EvictionTilePriorityQueue> queue(
-          host_impl_.BuildEvictionQueue(priorities[priority_count]));
+          host_impl_.tile_manager()->BuildEvictionQueue());
       while (count--) {
         ASSERT_FALSE(queue->IsEmpty());
         ASSERT_TRUE(queue->Top() != NULL);
         queue->Pop();
       }
       priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult(
@@ skipping 167 matching lines @@
   RunEvictionQueueConstructAndIterateTest("10_64", 10, 64);
   RunEvictionQueueConstructAndIterateTest("10_128", 10, 128);
   RunEvictionQueueConstructAndIterateTest("50_16", 50, 16);
   RunEvictionQueueConstructAndIterateTest("50_32", 50, 32);
   RunEvictionQueueConstructAndIterateTest("50_64", 50, 64);
   RunEvictionQueueConstructAndIterateTest("50_128", 50, 128);
 }
 
 }  // namespace
 }  // namespace cc