cc/test/fake_picture_layer_impl.cc - Issue 260963008: Fixing crash in PictureLayerImpl::MarkVisibleResourcesAsRequired when low-res tiles are disabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/test/fake_picture_layer_impl.cc

Issue 260963008: Fixing crash in PictureLayerImpl::MarkVisibleResourcesAsRequired when low-res tiles are disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Refactoring and more unittests for low res disabled. Created 6 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

Index: cc/test/fake_picture_layer_impl.cc

diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc

index 88dde4dbdc638e4b838773c4567e5eef0cbd90a8..ff3f54b67959ef259dab23345b2a4bb78e0f1b45 100644

--- a/cc/test/fake_picture_layer_impl.cc

+++ b/cc/test/fake_picture_layer_impl.cc

@@ -136,11 +136,15 @@ void FakePictureLayerImpl::CreateDefaultTilingsAndTiles() {

layer_tree_impl()->UpdateDrawProperties();

if (CanHaveTilings()) {

- DCHECK_EQ(tilings()->num_tilings(), 2u);

+ DCHECK_EQ(

+ tilings()->num_tilings(),

+ layer_tree_impl()->settings().create_low_res_tiling ? 2u : 1u);

DCHECK_EQ(tilings()->tiling_at(0)->resolution(), HIGH_RESOLUTION);

- DCHECK_EQ(tilings()->tiling_at(1)->resolution(), LOW_RESOLUTION);

HighResTiling()->CreateAllTilesForTesting();

- LowResTiling()->CreateAllTilesForTesting();

+ if (layer_tree_impl()->settings().create_low_res_tiling) {

+ DCHECK_EQ(tilings()->tiling_at(1)->resolution(), LOW_RESOLUTION);

+ LowResTiling()->CreateAllTilesForTesting();

+ }

} else {

DCHECK_EQ(tilings()->num_tilings(), 0u);

}

« cc/layers/picture_layer_impl_unittest.cc ('K') | « cc/resources/tile_manager_unittest.cc ('k') | cc/test/fake_picture_pile_impl.cc » ('j') | cc/test/impl_side_painting_settings.h » ('J')