cc: Make eviction queue building consistent with raster.

cc/resources/tile_manager_unittest.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/eviction_tile_priority_queue.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/begin_frame_args_test.h"
@@ skipping 555 matching lines @@
   // Ensure we can activate.
   EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
   EXPECT_TRUE(pending_child_raw->AllTilesRequiredForActivationAreReadyToDraw());
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, EvictionTilePriorityQueue) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
-  EvictionTilePriorityQueue empty_queue;
-  host_impl_.BuildEvictionQueue(&empty_queue, SAME_PRIORITY_FOR_BOTH_TREES);
-  EXPECT_TRUE(empty_queue.IsEmpty());
+  scoped_ptr<EvictionTilePriorityQueue> empty_queue(
+      host_impl_.BuildEvictionQueue(SAME_PRIORITY_FOR_BOTH_TREES));
+  EXPECT_TRUE(empty_queue->IsEmpty());
   std::set<Tile*> all_tiles;
   size_t tile_count = 0;
 
   scoped_ptr<RasterTilePriorityQueue> raster_queue(host_impl_.BuildRasterQueue(
       SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
   while (!raster_queue->IsEmpty()) {
     ++tile_count;
     EXPECT_TRUE(raster_queue->Top());
     all_tiles.insert(raster_queue->Top());
     raster_queue->Pop();
   }
 
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   tile_manager()->InitializeTilesWithResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
-  EvictionTilePriorityQueue queue;
-  host_impl_.BuildEvictionQueue(&queue, SMOOTHNESS_TAKES_PRIORITY);
-  EXPECT_FALSE(queue.IsEmpty());
+  scoped_ptr<EvictionTilePriorityQueue> queue(
+      host_impl_.BuildEvictionQueue(SMOOTHNESS_TAKES_PRIORITY));
+  EXPECT_FALSE(queue->IsEmpty());
 
   // Sanity check, all tiles should be visible.
   std::set<Tile*> smoothness_tiles;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
     EXPECT_EQ(TilePriority::NOW, tile->priority(ACTIVE_TREE).priority_bin);
     EXPECT_EQ(TilePriority::NOW, tile->priority(PENDING_TREE).priority_bin);
     EXPECT_TRUE(tile->HasResource());
     smoothness_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(all_tiles, smoothness_tiles);
 
   tile_manager()->ReleaseTileResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
   Region invalidation(gfx::Rect(0, 0, 500, 500));
 
   // Invalidate the pending tree.
   pending_layer_->set_invalidation(invalidation);
@@ skipping 36 matching lines @@
   for (size_t i = 0; i < active_low_res_tiles.size(); ++i)
     all_tiles.insert(active_low_res_tiles[i]);
 
   tile_manager()->InitializeTilesWithResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
   Tile* last_tile = NULL;
   smoothness_tiles.clear();
   tile_count = 0;
   // Here we expect to get increasing ACTIVE_TREE priority_bin.
-  queue.Reset();
-  host_impl_.BuildEvictionQueue(&queue, SMOOTHNESS_TAKES_PRIORITY);
+  queue = host_impl_.BuildEvictionQueue(SMOOTHNESS_TAKES_PRIORITY);
   int distance_increasing = 0;
   int distance_decreasing = 0;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
     EXPECT_TRUE(tile->HasResource());
 
     if (!last_tile)
       last_tile = tile;
 
     EXPECT_GE(last_tile->priority(ACTIVE_TREE).priority_bin,
               tile->priority(ACTIVE_TREE).priority_bin);
     if (last_tile->priority(ACTIVE_TREE).priority_bin ==
         tile->priority(ACTIVE_TREE).priority_bin) {
       EXPECT_LE(last_tile->required_for_activation(),
                 tile->required_for_activation());
       if (last_tile->required_for_activation() ==
           tile->required_for_activation()) {
         if (last_tile->priority(ACTIVE_TREE).distance_to_visible >=
             tile->priority(ACTIVE_TREE).distance_to_visible)
           ++distance_decreasing;
         else
           ++distance_increasing;
       }
     }
 
     last_tile = tile;
     ++tile_count;
     smoothness_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(3, distance_increasing);
   EXPECT_EQ(16, distance_decreasing);
   EXPECT_EQ(tile_count, smoothness_tiles.size());
   EXPECT_EQ(all_tiles, smoothness_tiles);
 
   std::set<Tile*> new_content_tiles;
   last_tile = NULL;
   // Here we expect to get increasing PENDING_TREE priority_bin.
-  queue.Reset();
-  host_impl_.BuildEvictionQueue(&queue, NEW_CONTENT_TAKES_PRIORITY);
+  queue = host_impl_.BuildEvictionQueue(NEW_CONTENT_TAKES_PRIORITY);
   distance_decreasing = 0;
   distance_increasing = 0;
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     EXPECT_TRUE(tile);
 
     if (!last_tile)
       last_tile = tile;
 
     EXPECT_GE(last_tile->priority(PENDING_TREE).priority_bin,
               tile->priority(PENDING_TREE).priority_bin);
     if (last_tile->priority(PENDING_TREE).priority_bin ==
         tile->priority(PENDING_TREE).priority_bin) {
       EXPECT_LE(last_tile->required_for_activation(),
                 tile->required_for_activation());
       if (last_tile->required_for_activation() ==
           tile->required_for_activation()) {
         if (last_tile->priority(PENDING_TREE).distance_to_visible >=
             tile->priority(PENDING_TREE).distance_to_visible)
           ++distance_decreasing;
         else
           ++distance_increasing;
       }
     }
 
     last_tile = tile;
     new_content_tiles.insert(tile);
-    queue.Pop();
+    queue->Pop();
   }
 
   EXPECT_EQ(3, distance_increasing);
   EXPECT_EQ(16, distance_decreasing);
   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(all_tiles, new_content_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest,
        EvictionTilePriorityQueueWithOcclusion) {
@@ skipping 75 matching lines @@
   all_tiles.insert(pending_child_low_res_tiles.begin(),
                    pending_child_low_res_tiles.end());
 
   tile_manager()->InitializeTilesWithResourcesForTesting(
       std::vector<Tile*>(all_tiles.begin(), all_tiles.end()));
 
   // Verify occlusion is considered by EvictionTilePriorityQueue.
   TreePriority tree_priority = NEW_CONTENT_TAKES_PRIORITY;
   size_t occluded_count = 0u;
   Tile* last_tile = NULL;
-  EvictionTilePriorityQueue queue;
-  host_impl_.BuildEvictionQueue(&queue, tree_priority);
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  scoped_ptr<EvictionTilePriorityQueue> queue(
+      host_impl_.BuildEvictionQueue(tree_priority));
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     if (!last_tile)
       last_tile = tile;
 
     bool tile_is_occluded = tile->is_occluded_for_tree_priority(tree_priority);
 
     // The only way we will encounter an occluded tile after an unoccluded
     // tile is if the priorty bin decreased, the tile is required for
     // activation, or the scale changed.
     if (tile_is_occluded) {
       occluded_count++;
 
       bool last_tile_is_occluded =
           last_tile->is_occluded_for_tree_priority(tree_priority);
       if (!last_tile_is_occluded) {
         TilePriority::PriorityBin tile_priority_bin =
             tile->priority_for_tree_priority(tree_priority).priority_bin;
         TilePriority::PriorityBin last_tile_priority_bin =
             last_tile->priority_for_tree_priority(tree_priority).priority_bin;
 
         EXPECT_TRUE((tile_priority_bin < last_tile_priority_bin) ||
                     tile->required_for_activation() ||
                     (tile->contents_scale() != last_tile->contents_scale()));
       }
     }
     last_tile = tile;
-    queue.Pop();
+    queue->Pop();
   }
   size_t expected_occluded_count =
       pending_child_high_res_tiles.size() + pending_child_low_res_tiles.size();
   EXPECT_EQ(expected_occluded_count, occluded_count);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest,
        EvictionTilePriorityQueueWithTransparentLayer) {
   base::TimeTicks time_ticks;
   time_ticks += base::TimeDelta::FromMilliseconds(1);
@@ skipping 76 matching lines @@
 
   EXPECT_TRUE(pending_layer_->HasValidTilePriorities());
   EXPECT_FALSE(pending_child_layer->HasValidTilePriorities());
 
   // Verify that eviction queue returns tiles also from layers without valid
   // tile priorities and that the tile priority bin of those tiles is (at most)
   // EVENTUALLY.
   TreePriority tree_priority = NEW_CONTENT_TAKES_PRIORITY;
   std::set<Tile*> new_content_tiles;
   size_t tile_count = 0;
-  EvictionTilePriorityQueue queue;
-  host_impl_.BuildEvictionQueue(&queue, tree_priority);
-  while (!queue.IsEmpty()) {
-    Tile* tile = queue.Top();
+  scoped_ptr<EvictionTilePriorityQueue> queue(
+      host_impl_.BuildEvictionQueue(tree_priority));
+  while (!queue->IsEmpty()) {
+    Tile* tile = queue->Top();
     const TilePriority& pending_priority = tile->priority(PENDING_TREE);
     EXPECT_NE(std::numeric_limits<float>::infinity(),
               pending_priority.distance_to_visible);
     if (all_pending_child_tiles.find(tile) != all_pending_child_tiles.end())
       EXPECT_EQ(TilePriority::EVENTUALLY, pending_priority.priority_bin);
     else
       EXPECT_EQ(TilePriority::NOW, pending_priority.priority_bin);
     new_content_tiles.insert(tile);
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(all_tiles, new_content_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, RasterTilePriorityQueueEmptyLayers) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl_.SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
@@ skipping 53 matching lines @@
     all_tiles.insert(raster_queue->Top());
     ++tile_count;
     raster_queue->Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   std::vector<Tile*> tiles(all_tiles.begin(), all_tiles.end());
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
 
-  EvictionTilePriorityQueue queue;
   for (int i = 1; i < 10; ++i) {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::Create(host_impl_.pending_tree(), id_ + i);
     pending_layer->SetDrawsContent(true);
     pending_layer->set_has_valid_tile_priorities(true);
     pending_layer_->AddChild(pending_layer.Pass());
   }
 
-  host_impl_.BuildEvictionQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
-  EXPECT_FALSE(queue.IsEmpty());
+  scoped_ptr<EvictionTilePriorityQueue> queue(
+      host_impl_.BuildEvictionQueue(SAME_PRIORITY_FOR_BOTH_TREES));
+  EXPECT_FALSE(queue->IsEmpty());
 
   tile_count = 0;
   all_tiles.clear();
-  while (!queue.IsEmpty()) {
-    EXPECT_TRUE(queue.Top());
-    all_tiles.insert(queue.Top());
+  while (!queue->IsEmpty()) {
+    EXPECT_TRUE(queue->Top());
+    all_tiles.insert(queue->Top());
     ++tile_count;
-    queue.Pop();
+    queue->Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest,
        RasterTilePriorityQueueStaticViewport) {
   FakePictureLayerTilingClient client;
 
   gfx::Rect viewport(50, 50, 100, 100);
@@ skipping 174 matching lines @@
   EXPECT_GT(eventually_bin_order_correct_count,
             eventually_bin_order_incorrect_count);
 
   EXPECT_TRUE(have_tiles[TilePriority::NOW]);
   EXPECT_TRUE(have_tiles[TilePriority::SOON]);
   EXPECT_TRUE(have_tiles[TilePriority::EVENTUALLY]);
 }
 
 }  // namespace
 }  // namespace cc