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 675ce882b09980726d7965e12c61969d3b28b91d..968b32051d269a896da07774bb2018ade0cda057 100644 |
--- a/cc/resources/picture_layer_tiling_unittest.cc |
+++ b/cc/resources/picture_layer_tiling_unittest.cc |
@@ -65,9 +65,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; |
@@ -1285,8 +1282,8 @@ 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(), |
+ PictureLayerTiling::NOW); |
// Tiles don't have resources to evict. |
EXPECT_FALSE(it); |
@@ -1301,7 +1298,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) { |
std::set<Tile*> eviction_tiles; |
it = PictureLayerTiling::TilingEvictionTileIterator( |
- tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::EVENTUALLY); |
+ tiling.get(), PictureLayerTiling::EVENTUALLY); |
EXPECT_TRUE(it); |
for (; it; ++it) { |
Tile* tile = *it; |
@@ -1312,8 +1309,8 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) { |
eviction_tiles.insert(tile); |
} |
- it = PictureLayerTiling::TilingEvictionTileIterator( |
- tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::SOON); |
+ it = PictureLayerTiling::TilingEvictionTileIterator(tiling.get(), |
+ PictureLayerTiling::SOON); |
EXPECT_TRUE(it); |
for (; it; ++it) { |
Tile* tile = *it; |
@@ -1323,8 +1320,8 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) { |
eviction_tiles.insert(tile); |
} |
- it = PictureLayerTiling::TilingEvictionTileIterator( |
- tiling.get(), SMOOTHNESS_TAKES_PRIORITY, PictureLayerTiling::NOW); |
+ it = PictureLayerTiling::TilingEvictionTileIterator(tiling.get(), |
+ PictureLayerTiling::NOW); |
EXPECT_TRUE(it); |
for (; it; ++it) { |
Tile* tile = *it; |
@@ -1336,23 +1333,11 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) { |
it = PictureLayerTiling::TilingEvictionTileIterator( |
tiling.get(), |
- SMOOTHNESS_TAKES_PRIORITY, |
PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION); |
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) { |