Merge 241994 "Revert "cc: Added tile bundles""

cc/resources/prioritized_tile_set_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 <algorithm>
 #include <vector>
 
 #include "cc/resources/managed_tile_state.h"
 #include "cc/resources/prioritized_tile_set.h"
 #include "cc/resources/tile.h"
-#include "cc/resources/tile_bundle.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/fake_tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
 #include "cc/test/test_tile_priorities.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
@@ skipping 50 matching lines @@
     return tile_manager_->CreateTile(picture_pile_.get(),
                                      settings_.default_tile_size,
                                      gfx::Rect(),
                                      gfx::Rect(),
                                      1.0,
                                      0,
                                      0,
                                      Tile::USE_LCD_TEXT);
   }
 
-  scoped_refptr<Tile> CreateTileWithPriority(
-      const TilePriority& priority) {
-    scoped_refptr<TileBundle> bundle =
-        tile_manager_->CreateTileBundle(0, 0, 1, 1);
-    scoped_refptr<Tile> tile = CreateTile();
-    bundle->AddTileAt(ACTIVE_TREE, 0, 0, tile);
-    bundle->AddTileAt(PENDING_TREE, 0, 0, tile);
-    bundle->SetPriority(ACTIVE_TREE, priority);
-    bundle->SetPriority(PENDING_TREE, priority);
-    return tile;
-  }
-
  private:
   LayerTreeSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
   scoped_ptr<FakeOutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   FakeTileManagerClient tile_manager_client_;
   scoped_ptr<FakeTileManager> tile_manager_;
   scoped_refptr<FakePicturePileImpl> picture_pile_;
 };
 
@@ skipping 25 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN);
     }
   }
 
   // Tiles should appear in the same order as inserted.
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
        it;
        ++it) {
     EXPECT_TRUE(*it == tiles[i].get());
     ++i;
   }
   EXPECT_EQ(20, i);
 }
 
 TEST_F(PrioritizedTileSetTest, NowBin) {
   // Ensure that tiles in NOW_BIN are sorted according to BinComparator.
 
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, NOW_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 11 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, SOON_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 12 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, SOON_BIN);
     }
   }
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, false);
        it;
        ++it) {
     EXPECT_TRUE(*it == tiles[i].get());
     ++i;
   }
   EXPECT_EQ(20, i);
 }
 
 TEST_F(PrioritizedTileSetTest, EventuallyAndActiveBin) {
   // Ensure that EVENTUALLY_AND_ACTIVE_BIN tiles are sorted.
 
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 11 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, EVENTUALLY_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 11 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 11 matching lines @@
   PrioritizedTileSet set;
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   std::vector<scoped_refptr<Tile> > tiles;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
       tiles.push_back(tile);
       set.InsertTile(tile, AT_LAST_BIN);
     }
   }
 
   // Tiles should appear in BinComparator order.
   std::sort(tiles.begin(), tiles.end(), BinComparator());
 
   int i = 0;
   for (PrioritizedTileSet::Iterator it(&set, true);
@@ skipping 59 matching lines @@
 
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   PrioritizedTileSet set;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
 
       now_and_ready_to_draw_bins.push_back(tile);
       now_bins.push_back(tile);
       soon_bins.push_back(tile);
       eventually_and_active_bins.push_back(tile);
       eventually_bins.push_back(tile);
       at_last_bins.push_back(tile);
       at_last_and_active_bins.push_back(tile);
 
       set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN);
@@ skipping 88 matching lines @@
 
   TilePriority priorities[4] = {
       TilePriorityForEventualBin(),
       TilePriorityForNowBin(),
       TilePriority(),
       TilePriorityForSoonBin()};
 
   PrioritizedTileSet set;
   for (int priority = 0; priority < 4; ++priority) {
     for (int i = 0; i < 5; ++i) {
-      scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+      scoped_refptr<Tile> tile = CreateTile();
+      tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+      tile->SetPriority(PENDING_TREE, priorities[priority]);
 
       now_and_ready_to_draw_bins.push_back(tile);
       now_bins.push_back(tile);
       soon_bins.push_back(tile);
       eventually_and_active_bins.push_back(tile);
       eventually_bins.push_back(tile);
       at_last_bins.push_back(tile);
       at_last_and_active_bins.push_back(tile);
 
       set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN);
@@ skipping 155 matching lines @@
 
   set.Clear();
 
   PrioritizedTileSet::Iterator empty_it(&set, true);
   EXPECT_FALSE(empty_it);
 }
 
 }  // namespace
 }  // namespace cc