Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 1102333002: cc: Drop skip_shared_out_of_order_tiles field from TilingSetEvictionQueue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/picture_layer_impl_perftest.cc ('k') | cc/resources/eviction_tile_priority_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index b39ef1e961775ead01cf3a1a0a0d91396b308f18..f5702d32614d280e6e6bdbafdcf429166d17d2c5 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -3163,8 +3163,8 @@ TEST_F(PictureLayerImplTest, TilingSetEvictionQueue) {
EXPECT_GT(number_of_unmarked_tiles, 1u);
// Tiles don't have resources yet.
- scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue(
- pending_layer_->picture_layer_tiling_set(), false));
+ scoped_ptr<TilingSetEvictionQueue> queue(
+ new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set()));
EXPECT_TRUE(queue->IsEmpty());
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
@@ -3176,8 +3176,8 @@ TEST_F(PictureLayerImplTest, TilingSetEvictionQueue) {
Tile* last_tile = nullptr;
size_t distance_decreasing = 0;
size_t distance_increasing = 0;
- queue.reset(new TilingSetEvictionQueue(
- pending_layer_->picture_layer_tiling_set(), false));
+ queue.reset(
+ new TilingSetEvictionQueue(pending_layer_->picture_layer_tiling_set()));
while (!queue->IsEmpty()) {
Tile* tile = queue->Top();
if (!last_tile)
@@ -3968,15 +3968,14 @@ class OcclusionTrackingPictureLayerImplTest : public PictureLayerImplTest {
: PictureLayerImplTest(OcclusionTrackingSettings()) {}
void VerifyEvictionConsidersOcclusion(FakePictureLayerImpl* layer,
- FakePictureLayerImpl* twin_layer,
WhichTree tree,
size_t expected_occluded_tile_count,
int source_line) {
size_t occluded_tile_count = 0u;
Tile* last_tile = nullptr;
- scoped_ptr<TilingSetEvictionQueue> queue(new TilingSetEvictionQueue(
- layer->picture_layer_tiling_set(), layer && twin_layer));
+ scoped_ptr<TilingSetEvictionQueue> queue(
+ new TilingSetEvictionQueue(layer->picture_layer_tiling_set()));
while (!queue->IsEmpty()) {
Tile* tile = queue->Top();
if (!last_tile)
@@ -4532,29 +4531,29 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
VerifyEvictionConsidersOcclusion(
- pending_layer_, active_layer_, PENDING_TREE,
+ pending_layer_, PENDING_TREE,
total_expected_occluded_tile_count_on_trees[PENDING_TREE], __LINE__);
VerifyEvictionConsidersOcclusion(
- active_layer_, pending_layer_, ACTIVE_TREE,
+ active_layer_, ACTIVE_TREE,
total_expected_occluded_tile_count_on_trees[ACTIVE_TREE], __LINE__);
// Repeat the tests without valid active tree priorities.
active_layer_->set_has_valid_tile_priorities(false);
VerifyEvictionConsidersOcclusion(
- pending_layer_, active_layer_, PENDING_TREE,
+ pending_layer_, PENDING_TREE,
total_expected_occluded_tile_count_on_trees[PENDING_TREE], __LINE__);
VerifyEvictionConsidersOcclusion(
- active_layer_, pending_layer_, ACTIVE_TREE,
+ active_layer_, ACTIVE_TREE,
total_expected_occluded_tile_count_on_trees[ACTIVE_TREE], __LINE__);
active_layer_->set_has_valid_tile_priorities(true);
// Repeat the tests without valid pending tree priorities.
pending_layer_->set_has_valid_tile_priorities(false);
VerifyEvictionConsidersOcclusion(
- active_layer_, pending_layer_, ACTIVE_TREE,
+ active_layer_, ACTIVE_TREE,
total_expected_occluded_tile_count_on_trees[ACTIVE_TREE], __LINE__);
VerifyEvictionConsidersOcclusion(
- pending_layer_, active_layer_, PENDING_TREE,
+ pending_layer_, PENDING_TREE,
total_expected_occluded_tile_count_on_trees[PENDING_TREE], __LINE__);
pending_layer_->set_has_valid_tile_priorities(true);
}
« no previous file with comments | « cc/layers/picture_layer_impl_perftest.cc ('k') | cc/resources/eviction_tile_priority_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698