| 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 b982dc195f2d41b334873a79d50a0bd12e35fedb..815ff995bdbbd6f706d4b3220f23acceeea0a925 100644
|
| --- a/cc/resources/picture_layer_tiling_unittest.cc
|
| +++ b/cc/resources/picture_layer_tiling_unittest.cc
|
| @@ -62,9 +62,6 @@ class TestablePictureLayerTiling : public PictureLayerTiling {
|
| }
|
|
|
| gfx::Rect live_tiles_rect() const { return live_tiles_rect_; }
|
| - bool eviction_tiles_cache_valid() const {
|
| - return eviction_tiles_cache_valid_;
|
| - }
|
|
|
| using PictureLayerTiling::ComputeSkewport;
|
| using PictureLayerTiling::RemoveTileAt;
|
| @@ -1274,7 +1271,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| std::vector<Tile*> all_tiles = tiling->AllTilesForTesting();
|
|
|
| PictureLayerTiling::TilingEvictionTileIterator it(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW);
|
| + tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW, false);
|
|
|
| // Tiles don't have resources to evict.
|
| EXPECT_FALSE(it);
|
| @@ -1289,7 +1286,8 @@ 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,
|
| + false);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1301,7 +1299,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| }
|
|
|
| it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::SOON);
|
| + tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::SOON, false);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1312,7 +1310,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| }
|
|
|
| it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW);
|
| + tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW, false);
|
| EXPECT_TRUE(it);
|
| for (; it; ++it) {
|
| Tile* tile = *it;
|
| @@ -1323,24 +1321,12 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
|
| }
|
|
|
| it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(),
|
| - SMOOTHNESS_TAKES_PRIORITY,
|
| - PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION);
|
| + tiling.get(), SMOOTHNESS_TAKES_PRIORITY,
|
| + PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION, false);
|
| EXPECT_FALSE(it);
|
|
|
| EXPECT_GT(all_tiles_set.size(), 0u);
|
| EXPECT_EQ(all_tiles_set, eviction_tiles);
|
| -
|
| - EXPECT_TRUE(tiling->eviction_tiles_cache_valid());
|
| - tiling->RemoveTileAt(0, 0, nullptr);
|
| - EXPECT_FALSE(tiling->eviction_tiles_cache_valid());
|
| -
|
| - it = PictureLayerTiling::TilingEvictionTileIterator(
|
| - tiling.get(), SMOOTHNESS_TAKES_PRIORITY,
|
| - PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION);
|
| - EXPECT_TRUE(tiling->eviction_tiles_cache_valid());
|
| - tiling->Reset();
|
| - EXPECT_FALSE(tiling->eviction_tiles_cache_valid());
|
| }
|
|
|
| TEST_F(PictureLayerTilingIteratorTest, TilesExist) {
|
|
|