Index: cc/resources/prioritized_tile_set_unittest.cc |
diff --git a/cc/resources/prioritized_tile_set_unittest.cc b/cc/resources/prioritized_tile_set_unittest.cc |
index db006456cd925d3dd41c974d7a37bdecacb4c512..f744d60edf4f9222fbdafa55eac1f1ede39e4ceb 100644 |
--- a/cc/resources/prioritized_tile_set_unittest.cc |
+++ b/cc/resources/prioritized_tile_set_unittest.cc |
@@ -81,7 +81,7 @@ class PrioritizedTileSetTest : public testing::Test { |
for (std::vector<scoped_refptr<Tile> >::iterator it = tiles->begin(); |
it != tiles->end(); |
it++) { |
- Tile* tile = *it; |
+ Tile* tile = it->get(); |
tile->SetPriority(ACTIVE_TREE, TilePriority()); |
tile->SetPriority(PENDING_TREE, TilePriority()); |
} |
@@ -112,7 +112,7 @@ TEST_F(PrioritizedTileSetTest, EmptyIterator) { |
TEST_F(PrioritizedTileSetTest, NonEmptyIterator) { |
PrioritizedTileSet set; |
scoped_refptr<Tile> tile = CreateTile(); |
- set.InsertTile(tile, NOW_BIN); |
+ set.InsertTile(tile.get(), NOW_BIN); |
PrioritizedTileSet::Iterator it(&set, true); |
EXPECT_TRUE(it); |
@@ -138,7 +138,7 @@ TEST_F(PrioritizedTileSetTest, NowAndReadyToDrawBin) { |
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); |
+ set.InsertTile(tile.get(), NOW_AND_READY_TO_DRAW_BIN); |
} |
} |
@@ -172,7 +172,7 @@ TEST_F(PrioritizedTileSetTest, NowBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, NOW_BIN); |
+ set.InsertTile(tile.get(), NOW_BIN); |
} |
} |
@@ -208,7 +208,7 @@ TEST_F(PrioritizedTileSetTest, SoonBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, SOON_BIN); |
+ set.InsertTile(tile.get(), SOON_BIN); |
} |
} |
@@ -245,7 +245,7 @@ TEST_F(PrioritizedTileSetTest, SoonBinNoPriority) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, SOON_BIN); |
+ set.InsertTile(tile.get(), SOON_BIN); |
} |
} |
@@ -278,7 +278,7 @@ TEST_F(PrioritizedTileSetTest, EventuallyAndActiveBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_AND_ACTIVE_BIN); |
} |
} |
@@ -314,7 +314,7 @@ TEST_F(PrioritizedTileSetTest, EventuallyBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, EVENTUALLY_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_BIN); |
} |
} |
@@ -350,7 +350,7 @@ TEST_F(PrioritizedTileSetTest, AtLastAndActiveBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_AND_ACTIVE_BIN); |
} |
} |
@@ -386,7 +386,7 @@ TEST_F(PrioritizedTileSetTest, AtLastBin) { |
tile->SetPriority(ACTIVE_TREE, priorities[priority]); |
tile->SetPriority(PENDING_TREE, priorities[priority]); |
tiles.push_back(tile); |
- set.InsertTile(tile, AT_LAST_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_BIN); |
} |
} |
@@ -418,13 +418,13 @@ TEST_F(PrioritizedTileSetTest, TilesForEachBin) { |
scoped_refptr<Tile> at_last_and_active_bin = CreateTile(); |
PrioritizedTileSet set; |
- set.InsertTile(soon_bin, SOON_BIN); |
- set.InsertTile(at_last_and_active_bin, AT_LAST_AND_ACTIVE_BIN); |
- set.InsertTile(eventually_bin, EVENTUALLY_BIN); |
- set.InsertTile(now_bin, NOW_BIN); |
- set.InsertTile(eventually_and_active_bin, EVENTUALLY_AND_ACTIVE_BIN); |
- set.InsertTile(at_last_bin, AT_LAST_BIN); |
- set.InsertTile(now_and_ready_to_draw_bin, NOW_AND_READY_TO_DRAW_BIN); |
+ set.InsertTile(soon_bin.get(), SOON_BIN); |
+ set.InsertTile(at_last_and_active_bin.get(), AT_LAST_AND_ACTIVE_BIN); |
+ set.InsertTile(eventually_bin.get(), EVENTUALLY_BIN); |
+ set.InsertTile(now_bin.get(), NOW_BIN); |
+ set.InsertTile(eventually_and_active_bin.get(), EVENTUALLY_AND_ACTIVE_BIN); |
+ set.InsertTile(at_last_bin.get(), AT_LAST_BIN); |
+ set.InsertTile(now_and_ready_to_draw_bin.get(), NOW_AND_READY_TO_DRAW_BIN); |
// Tiles should appear in order. |
PrioritizedTileSet::Iterator it(&set, true); |
@@ -478,13 +478,13 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
at_last_bins.push_back(tile); |
at_last_and_active_bins.push_back(tile); |
- set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN); |
- set.InsertTile(tile, NOW_BIN); |
- set.InsertTile(tile, SOON_BIN); |
- set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN); |
- set.InsertTile(tile, EVENTUALLY_BIN); |
- set.InsertTile(tile, AT_LAST_BIN); |
- set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), NOW_AND_READY_TO_DRAW_BIN); |
+ set.InsertTile(tile.get(), NOW_BIN); |
+ set.InsertTile(tile.get(), SOON_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_AND_ACTIVE_BIN); |
} |
} |
@@ -495,14 +495,14 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
for (vector_it = now_and_ready_to_draw_bins.begin(); |
vector_it != now_and_ready_to_draw_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
// Now bins are sorted. |
std::sort(now_bins.begin(), now_bins.end(), BinComparator()); |
for (vector_it = now_bins.begin(); vector_it != now_bins.end(); ++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -510,7 +510,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
std::sort(soon_bins.begin(), soon_bins.end(), BinComparator()); |
for (vector_it = soon_bins.begin(); vector_it != soon_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -521,7 +521,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
for (vector_it = eventually_and_active_bins.begin(); |
vector_it != eventually_and_active_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -529,7 +529,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
std::sort(eventually_bins.begin(), eventually_bins.end(), BinComparator()); |
for (vector_it = eventually_bins.begin(); vector_it != eventually_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -540,7 +540,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
for (vector_it = at_last_and_active_bins.begin(); |
vector_it != at_last_and_active_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -548,7 +548,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) { |
std::sort(at_last_bins.begin(), at_last_bins.end(), BinComparator()); |
for (vector_it = at_last_bins.begin(); vector_it != at_last_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -597,13 +597,13 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) { |
at_last_bins.push_back(tile); |
at_last_and_active_bins.push_back(tile); |
- set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN); |
- set.InsertTile(tile, NOW_BIN); |
- set.InsertTile(tile, SOON_BIN); |
- set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN); |
- set.InsertTile(tile, EVENTUALLY_BIN); |
- set.InsertTile(tile, AT_LAST_BIN); |
- set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), NOW_AND_READY_TO_DRAW_BIN); |
+ set.InsertTile(tile.get(), NOW_BIN); |
+ set.InsertTile(tile.get(), SOON_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_AND_ACTIVE_BIN); |
+ set.InsertTile(tile.get(), EVENTUALLY_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_BIN); |
+ set.InsertTile(tile.get(), AT_LAST_AND_ACTIVE_BIN); |
} |
} |
@@ -614,14 +614,14 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) { |
for (vector_it = now_and_ready_to_draw_bins.begin(); |
vector_it != now_and_ready_to_draw_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
// Now bins are sorted. |
std::sort(now_bins.begin(), now_bins.end(), BinComparator()); |
for (vector_it = now_bins.begin(); vector_it != now_bins.end(); ++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -629,7 +629,7 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) { |
std::sort(soon_bins.begin(), soon_bins.end(), BinComparator()); |
for (vector_it = soon_bins.begin(); vector_it != soon_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -643,14 +643,14 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) { |
for (vector_it = eventually_and_active_bins.begin(); |
vector_it != eventually_and_active_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
// Eventually bins are not sorted. |
for (vector_it = eventually_bins.begin(); vector_it != eventually_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -658,14 +658,14 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) { |
for (vector_it = at_last_and_active_bins.begin(); |
vector_it != at_last_and_active_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
// At last bins are not sorted. |
for (vector_it = at_last_bins.begin(); vector_it != at_last_bins.end(); |
++vector_it) { |
- EXPECT_TRUE(*vector_it == *it); |
+ EXPECT_TRUE(vector_it->get() == *it); |
++it; |
} |
@@ -688,8 +688,8 @@ TEST_F(PrioritizedTileSetTest, TilesForFirstAndLastBins) { |
scoped_refptr<Tile> at_last_bin = CreateTile(); |
PrioritizedTileSet set; |
- set.InsertTile(at_last_bin, AT_LAST_BIN); |
- set.InsertTile(now_and_ready_to_draw_bin, NOW_AND_READY_TO_DRAW_BIN); |
+ set.InsertTile(at_last_bin.get(), AT_LAST_BIN); |
+ set.InsertTile(now_and_ready_to_draw_bin.get(), NOW_AND_READY_TO_DRAW_BIN); |
// Only two tiles should appear and they should appear in order. |
PrioritizedTileSet::Iterator it(&set, true); |
@@ -710,11 +710,11 @@ TEST_F(PrioritizedTileSetTest, MultipleIterators) { |
scoped_refptr<Tile> at_last_bin = CreateTile(); |
PrioritizedTileSet set; |
- set.InsertTile(soon_bin, SOON_BIN); |
- set.InsertTile(eventually_bin, EVENTUALLY_BIN); |
- set.InsertTile(now_bin, NOW_BIN); |
- set.InsertTile(at_last_bin, AT_LAST_BIN); |
- set.InsertTile(now_and_ready_to_draw_bin, NOW_AND_READY_TO_DRAW_BIN); |
+ set.InsertTile(soon_bin.get(), SOON_BIN); |
+ set.InsertTile(eventually_bin.get(), EVENTUALLY_BIN); |
+ set.InsertTile(now_bin.get(), NOW_BIN); |
+ set.InsertTile(at_last_bin.get(), AT_LAST_BIN); |
+ set.InsertTile(now_and_ready_to_draw_bin.get(), NOW_AND_READY_TO_DRAW_BIN); |
// Tiles should appear in order. |
PrioritizedTileSet::Iterator it(&set, true); |