cc/layers/picture_layer_impl_unittest.cc - Issue 367833003: cc: Start using raster/eviction iterators.

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 367833003: cc: Start using raster/eviction iterators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 2 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

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 0bd471851f3cb05070950c6c0dc0b999e387bc14..8653024685e0a783679116cd12c6a48f6ef17ecd 100644

--- a/cc/layers/picture_layer_impl_unittest.cc

+++ b/cc/layers/picture_layer_impl_unittest.cc

@@ -1407,27 +1407,6 @@ TEST_F(PictureLayerImplTest, DisallowTileDrawQuads) {

render_pass->quad_list.front()->material);

}

-TEST_F(PictureLayerImplTest, MarkRequiredNullTiles) {

- gfx::Size tile_size(100, 100);

- gfx::Size layer_bounds(1000, 1000);

- scoped_refptr<FakePicturePileImpl> pending_pile =

- FakePicturePileImpl::CreateEmptyPile(tile_size, layer_bounds);

- // Layers with entirely empty piles can't get tilings.

- pending_pile->AddRecordingAt(0, 0);

- SetupPendingTree(pending_pile);

- ASSERT_TRUE(pending_layer_->CanHaveTilings());

- pending_layer_->AddTiling(1.0f);

- pending_layer_->AddTiling(2.0f);

- // It should be safe to call this (and MarkVisibleResourcesAsRequired)

- // on a layer with no recordings.

- host_impl_.pending_tree()->UpdateDrawProperties();

- pending_layer_->MarkVisibleResourcesAsRequired();

TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {

gfx::Size tile_size(100, 100);

gfx::Size layer_bounds(200, 200);

@@ -1451,43 +1430,22 @@ TEST_F(PictureLayerImplTest, MarkRequiredOffscreenTiles) {

ASSERT_TRUE(pending_layer_->CanHaveTilings());

PictureLayerTiling* tiling = pending_layer_->AddTiling(1.f);

host_impl_.pending_tree()->UpdateDrawProperties();

- EXPECT_EQ(tiling->resolution(), HIGH_RESOLUTION);

EXPECT_EQ(viewport, pending_layer_->visible_rect_for_tile_priority());

- // Fake set priorities.

- for (PictureLayerTiling::CoverageIterator iter(

- tiling, pending_layer_->contents_scale_x(), gfx::Rect(layer_bounds));

- iter;

- ++iter) {

- if (!*iter)

- continue;

- Tile* tile = *iter;

- TilePriority priority;

- priority.resolution = HIGH_RESOLUTION;

- gfx::Rect tile_bounds = iter.geometry_rect();

- if (pending_layer_->visible_rect_for_tile_priority().Intersects(

- tile_bounds)) {

- priority.priority_bin = TilePriority::NOW;

- priority.distance_to_visible = 0.f;

- } else {

- priority.priority_bin = TilePriority::SOON;

- priority.distance_to_visible = 1.f;

- }

- tile->SetPriority(PENDING_TREE, priority);

- }

- pending_layer_->MarkVisibleResourcesAsRequired();

+ base::TimeTicks time_ticks;

+ time_ticks += base::TimeDelta::FromMilliseconds(1);

+ host_impl_.SetCurrentBeginFrameArgs(

+ CreateBeginFrameArgsForTesting(time_ticks));

+ pending_layer_->UpdateTiles(Occlusion(), resourceless_software_draw);

+ EXPECT_EQ(HIGH_RESOLUTION, tiling->resolution());

int num_visible = 0;

int num_offscreen = 0;

- for (PictureLayerTiling::CoverageIterator iter(

- tiling, pending_layer_->contents_scale_x(), gfx::Rect(layer_bounds));

- iter;

+ for (PictureLayerTiling::TilingRasterTileIterator iter(tiling); iter;

++iter) {

- if (!*iter)

- continue;

const Tile* tile = *iter;

+ DCHECK(tile);

if (tile->priority(PENDING_TREE).distance_to_visible == 0.f) {

EXPECT_TRUE(tile->required_for_activation());

num_visible++;

@@ -1544,8 +1502,6 @@ TEST_F(PictureLayerImplTest, TileOutsideOfViewportForTilePriorityNotRequired) {

CreateBeginFrameArgsForTesting(time_ticks));

pending_layer_->UpdateTiles(Occlusion(), resourceless_software_draw);

- pending_layer_->MarkVisibleResourcesAsRequired();

// Intersect the two rects. Any tile outside should not be required for

// activation.

gfx::Rect viewport_for_tile_priority =

@@ -1754,7 +1710,9 @@ TEST_F(PictureLayerImplTest, HighResRequiredWhenUnsharedActiveAllReady) {

// No shared tiles and all active tiles ready, so pending can only

// activate with all high res tiles.

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertAllTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

@@ -1775,12 +1733,15 @@ TEST_F(PictureLayerImplTest, HighResRequiredWhenMissingHighResFlagOn) {

// When high res are required, even if the active tree is not ready,

// the high res tiles must be ready.

host_impl_.active_tree()->SetRequiresHighResToDraw();

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertAllTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

-TEST_F(PictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) {

+TEST_F(PictureLayerImplTest, AllHighResRequiredEvenIfShared) {

gfx::Size layer_bounds(400, 400);

gfx::Size tile_size(100, 100);

SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size);

@@ -1793,8 +1754,10 @@ TEST_F(PictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) {

// All tiles shared (no invalidation), so even though the active tree's

// tiles aren't ready, there is nothing required.

- pending_layer_->MarkVisibleResourcesAsRequired();

- AssertNoTilesRequired(pending_layer_->HighResTiling());

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

+ AssertAllTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

@@ -1823,7 +1786,9 @@ TEST_F(PictureLayerImplTest, NothingRequiredIfActiveMissingTiles) {

// Since the active layer has no tiles at all, the pending layer doesn't

// need content in order to activate.

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertNoTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

@@ -1848,7 +1813,9 @@ TEST_F(PictureLayerImplTest, HighResRequiredIfActiveCantHaveTiles) {

// to the case where there is no active layer, to avoid flashing content.

// This can happen if a layer exists for a while and switches from

// not being able to have content to having content.

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertAllTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

@@ -1862,12 +1829,19 @@ TEST_F(PictureLayerImplTest, HighResRequiredWhenActiveHasDifferentBounds) {

pending_layer_->SetBounds(pending_layer_bounds);

CreateHighLowResAndSetAllTilesVisible();

+ // TODO(vmpstr): This is confusing. Rework the test to create different bounds

+ // on different trees instead of fudging tilings.

+ pending_layer_->HighResTiling()->ComputeTilePriorityRects(

+ PENDING_TREE, gfx::Rect(pending_layer_bounds), 1.f, 1.f, Occlusion());

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

active_layer_->SetAllTilesReady();

// Since the active layer has different bounds, the pending layer needs all

// high res tiles in order to activate.

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertAllTilesRequired(pending_layer_->HighResTiling());

AssertNoTilesRequired(pending_layer_->LowResTiling());

}

@@ -2716,7 +2690,7 @@ TEST_F(PictureLayerImplTest, LayerEvictionTileIterator) {

++iter) {

if (mark_required) {

number_of_marked_tiles++;

- iter->MarkRequiredForActivation();

+ iter->set_required_for_activation(true);

} else {

number_of_unmarked_tiles++;

}

@@ -2928,7 +2902,6 @@ TEST_F(PictureLayerImplTest, LowResReadyToDrawNotEnoughToActivate) {

CreateHighLowResAndSetAllTilesVisible();

active_layer_->SetAllTilesReady();

- pending_layer_->MarkVisibleResourcesAsRequired();

// All pending layer tiles required are not ready.

EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());

@@ -2956,7 +2929,6 @@ TEST_F(PictureLayerImplTest, HighResReadyToDrawEnoughToActivate) {

CreateHighLowResAndSetAllTilesVisible();

active_layer_->SetAllTilesReady();

- pending_layer_->MarkVisibleResourcesAsRequired();

// All pending layer tiles required are not ready.

EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());

@@ -2985,8 +2957,6 @@ TEST_F(PictureLayerImplTest,

// And all the low-res tiles in the pending layer.

pending_layer_->SetAllTilesReadyInTiling(pending_layer_->LowResTiling());

- pending_layer_->MarkVisibleResourcesAsRequired();

// The unshared high-res tiles are not ready, so we cannot activate.

EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());

@@ -3009,8 +2979,6 @@ TEST_F(PictureLayerImplTest, SharedActiveHighResReadyNotEnoughToActivate) {

// Initialize all high-res tiles in the active layer.

active_layer_->SetAllTilesReadyInTiling(active_layer_->HighResTiling());

- pending_layer_->MarkVisibleResourcesAsRequired();

// The unshared high-res tiles are not ready, so we cannot activate.

EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());

@@ -3085,28 +3053,7 @@ TEST_F(NoLowResPictureLayerImplTest, ManageTilingsCreatesTilings) {

pending_layer_->tilings()->tiling_at(0)->contents_scale());

}

-TEST_F(NoLowResPictureLayerImplTest, MarkRequiredNullTiles) {

- gfx::Size tile_size(100, 100);

- gfx::Size layer_bounds(1000, 1000);

- scoped_refptr<FakePicturePileImpl> pending_pile =

- FakePicturePileImpl::CreateEmptyPile(tile_size, layer_bounds);

- // Layers with entirely empty piles can't get tilings.

- pending_pile->AddRecordingAt(0, 0);

- SetupPendingTree(pending_pile);

- ASSERT_TRUE(pending_layer_->CanHaveTilings());

- pending_layer_->AddTiling(1.0f);

- pending_layer_->AddTiling(2.0f);

- // It should be safe to call this (and MarkVisibleResourcesAsRequired)

- // on a layer with no recordings.

- host_impl_.pending_tree()->UpdateDrawProperties();

- pending_layer_->MarkVisibleResourcesAsRequired();

-TEST_F(NoLowResPictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) {

+TEST_F(NoLowResPictureLayerImplTest, AllHighResRequiredEvenIfShared) {

gfx::Size layer_bounds(400, 400);

gfx::Size tile_size(100, 100);

SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size);

@@ -3119,11 +3066,13 @@ TEST_F(NoLowResPictureLayerImplTest, NothingRequiredIfAllHighResTilesShared) {

// All tiles shared (no invalidation), so even though the active tree's

// tiles aren't ready, there is nothing required.

danakj 2014/10/08 18:46:25 This comment is wrong now, can you explain what is

vmpstr 2014/10/08 22:38:34 Done.

- pending_layer_->MarkVisibleResourcesAsRequired();

- AssertNoTilesRequired(pending_layer_->HighResTiling());

- if (host_impl_.settings().create_low_res_tiling) {

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ if (host_impl_.settings().create_low_res_tiling)

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

+ AssertAllTilesRequired(pending_layer_->HighResTiling());

+ if (host_impl_.settings().create_low_res_tiling)

AssertNoTilesRequired(pending_layer_->LowResTiling());

- }

}

TEST_F(NoLowResPictureLayerImplTest, NothingRequiredIfActiveMissingTiles) {

@@ -3152,7 +3101,10 @@ TEST_F(NoLowResPictureLayerImplTest, NothingRequiredIfActiveMissingTiles) {

// Since the active layer has no tiles at all, the pending layer doesn't

// need content in order to activate.

- pending_layer_->MarkVisibleResourcesAsRequired();

+ pending_layer_->HighResTiling()->UpdateAllTilePrioritiesForTesting();

+ if (host_impl_.settings().create_low_res_tiling)

+ pending_layer_->LowResTiling()->UpdateAllTilePrioritiesForTesting();

AssertNoTilesRequired(pending_layer_->HighResTiling());

if (host_impl_.settings().create_low_res_tiling)

AssertNoTilesRequired(pending_layer_->LowResTiling());

@@ -3745,7 +3697,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

if (tile_is_visible)

unoccluded_tile_count++;

}

- EXPECT_EQ(unoccluded_tile_count, 20 + 2);

+ EXPECT_EQ(20 + 2, unoccluded_tile_count);

// Full occlusion.

layer1->SetPosition(gfx::Point(0, 0));

@@ -3833,6 +3785,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {

PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);

+ tiling->UpdateAllTilePrioritiesForTesting();

occluded_tile_count = 0;

for (PictureLayerTiling::CoverageIterator iter(

@@ -3872,6 +3825,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {

PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);

+ tiling->UpdateAllTilePrioritiesForTesting();

occluded_tile_count = 0;

for (PictureLayerTiling::CoverageIterator iter(

@@ -3891,10 +3845,10 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

}

switch (i) {

case 0:

- EXPECT_EQ(occluded_tile_count, 25);

+ EXPECT_EQ(25, occluded_tile_count);

break;

case 1:

- EXPECT_EQ(occluded_tile_count, 4);

+ EXPECT_EQ(4, occluded_tile_count);

break;

default:

NOTREACHED();

@@ -3941,6 +3895,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest, OcclusionForDifferentScales) {

tilings.begin();

tiling_iterator != tilings.end();

++tiling_iterator) {

+ (*tiling_iterator)->UpdateAllTilePrioritiesForTesting();

std::vector<Tile*> tiles = (*tiling_iterator)->AllTilesForTesting();

occluded_tile_count = 0;

@@ -4008,6 +3963,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest, DifferentOcclusionOnTrees) {

for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {

PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);

+ tiling->UpdateAllTilePrioritiesForTesting();

for (PictureLayerTiling::CoverageIterator iter(

tiling,

@@ -4152,6 +4108,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {

PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);

tiling->CreateAllTilesForTesting();

+ tiling->UpdateAllTilePrioritiesForTesting();

size_t occluded_tile_count_on_pending = 0u;

size_t occluded_tile_count_on_active = 0u;

@@ -4186,6 +4143,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,

for (size_t i = 0; i < active_layer_->num_tilings(); ++i) {

PictureLayerTiling* tiling = active_layer_->tilings()->tiling_at(i);

tiling->CreateAllTilesForTesting();

+ tiling->UpdateAllTilePrioritiesForTesting();

size_t occluded_tile_count_on_pending = 0u;

size_t occluded_tile_count_on_active = 0u;

« cc/layers/picture_layer_impl.cc ('K') | « cc/layers/picture_layer_impl.cc ('k') | cc/resources/memory_history.h » ('j') | cc/resources/picture_layer_tiling.cc » ('J')