| Index: cc/resources/picture_layer_tiling_unittest.cc
|
| diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc
|
| index 2952c6a22931c6af20928e6a9fdc0c03a819b841..eb01a47abee72b46e264ffab262b25df6ab4583f 100644
|
| --- a/cc/resources/picture_layer_tiling_unittest.cc
|
| +++ b/cc/resources/picture_layer_tiling_unittest.cc
|
| @@ -1285,8 +1285,11 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
|
|
| std::vector<Tile*> all_tiles = tiling->AllTilesForTesting();
|
|
|
| - PictureLayerTiling::TilingEvictionTileIterator it(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW);
|
| + PictureLayerTiling::TilingEvictionTileIterator it(tiling.get(),
|
| + SMOOTHNESS_TAKES_PRIORITY,
|
| + PictureLayerTiling::NOW,
|
| + true,
|
| + true);
|
|
|
| // Tiles don't have resources to evict.
|
| EXPECT_FALSE(it);
|
| @@ -1301,7 +1304,11 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| std::set<Tile*> eviction_tiles;
|
|
|
| it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::EVENTUALLY);
|
| + tiling.get(),
|
| + SMOOTHNESS_TAKES_PRIORITY,
|
| + PictureLayerTiling::EVENTUALLY,
|
| + true,
|
| + true);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1312,8 +1319,11 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| eviction_tiles.insert(tile);
|
| }
|
|
|
| - it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::SOON);
|
| + it = PictureLayerTiling::TilingEvictionTileIterator(tiling.get(),
|
| + SMOOTHNESS_TAKES_PRIORITY,
|
| + PictureLayerTiling::SOON,
|
| + true,
|
| + true);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1323,8 +1333,11 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| eviction_tiles.insert(tile);
|
| }
|
|
|
| - it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW);
|
| + it = PictureLayerTiling::TilingEvictionTileIterator(tiling.get(),
|
| + SMOOTHNESS_TAKES_PRIORITY,
|
| + PictureLayerTiling::NOW,
|
| + true,
|
| + true);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1337,7 +1350,9 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| it = PictureLayerTiling::TilingEvictionTileIterator(
|
| tiling.get(),
|
| SMOOTHNESS_TAKES_PRIORITY,
|
| - PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION);
|
| + PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION,
|
| + true,
|
| + true);
|
| EXPECT_FALSE(it);
|
|
|
| EXPECT_GT(all_tiles_set.size(), 0u);
|
|
|