cc/resources/picture_layer_tiling_unittest.cc - Issue 367833003: cc: Start using raster/eviction iterators.

Unified Diff: cc/resources/picture_layer_tiling_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, 3 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/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 e64191d3b323bd72ddc731835c0c3f742d1be8a0..80582c125ad7f72348501f3e22e6b33945b77a9c 100644

--- a/cc/resources/picture_layer_tiling_unittest.cc

+++ b/cc/resources/picture_layer_tiling_unittest.cc

@@ -672,6 +672,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

gfx::ToEnclosedRect(gfx::ScaleRect(viewport, 0.25f));

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.f, 1.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

gfx::Rect soon_rect = viewport;

soon_rect.Inset(-312.f, -312.f, -312.f, -312.f);

@@ -721,10 +722,10 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

EXPECT_TRUE(have_eventually);

// Spot check some distances.

- // Tile at 5, 1 should begin at 41x9 in content space (without borders),

+ // Tile at 5, 1 should begin at 40x8 in content space (with borders),

// so the distance to a viewport that ends at 25x25 in content space

- // should be 17 (41 - 25 + 1). In layer space, then that should be

- // 17 / 0.25 = 68 pixels.

+ // should be 16 (40 - 25 + 1). In layer space, then that should be

+ // 16 / 0.25 = 64 pixels.

danakj 2014/09/19 01:41:47 This comment changed but the code didn't. Don't ch

vmpstr 2014/09/19 21:22:53 Whoops. I'm not sure how that crept in.

// We can verify that the content rect (with borders) is one pixel off

// 41,9 8x8 on all sides.

@@ -756,6 +757,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

EXPECT_EQ(35, skewport.height());

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.f, 2.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

have_now = false;

have_eventually = false;

@@ -807,6 +809,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

// Change the underlying layer scale.

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 2.0f, 3.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);

EXPECT_FLOAT_EQ(136.f, priority.distance_to_visible);

@@ -820,6 +823,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

// Test additional scales.

tiling = TestablePictureLayerTiling::Create(0.2f, layer_bounds, &client);

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.0f, 4.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);

EXPECT_FLOAT_EQ(110.f, priority.distance_to_visible);

@@ -831,6 +835,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {

EXPECT_FLOAT_EQ(60.f, priority.distance_to_visible);

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 0.5f, 5.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);

EXPECT_FLOAT_EQ(55.f, priority.distance_to_visible);

@@ -1079,6 +1084,7 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorStaticViewport) {

tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

PictureLayerTiling::TilingRasterTileIterator empty_iterator;

EXPECT_FALSE(empty_iterator);

@@ -1189,6 +1195,7 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorMovingViewport) {

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());

tiling->UpdateTilePriorities(

ACTIVE_TREE, moved_viewport, 1.0f, 2.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

gfx::Rect soon_rect = moved_viewport;

soon_rect.Inset(-312.f, -312.f, -312.f, -312.f);

@@ -1262,6 +1269,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {

tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);

tiling->UpdateTilePriorities(ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

PictureLayerTiling::TilingRasterTileIterator empty_iterator;

EXPECT_FALSE(empty_iterator);

@@ -1510,6 +1518,7 @@ TEST(UpdateTilePrioritiesTest, VisibleTiles) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1565,6 +1574,7 @@ TEST(UpdateTilePrioritiesTest, OffscreenTiles) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1630,6 +1640,7 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenLayer) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1689,6 +1700,7 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenRotatedLayer) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1772,6 +1784,7 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayer) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1865,6 +1878,7 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayerClippedByW) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -1936,6 +1950,7 @@ TEST(UpdateTilePrioritiesTest, BasicMotion) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -2014,6 +2029,7 @@ TEST(UpdateTilePrioritiesTest, RotationMotion) {

current_layer_contents_scale,

current_frame_time_in_seconds,

Occlusion());

+ tiling->UpdateAllTilePrioritiesForTesting();

ASSERT_TRUE(tiling->TileAt(0, 0));

ASSERT_TRUE(tiling->TileAt(0, 1));

@@ -2033,35 +2049,6 @@ TEST(UpdateTilePrioritiesTest, RotationMotion) {

EXPECT_EQ(TilePriority::NOW, priority.priority_bin);

}

-TEST(PictureLayerTilingTest, ResetClearsPriorities) {

- FakePictureLayerTilingClient client;

- scoped_ptr<TestablePictureLayerTiling> tiling;

- client.SetTileSize(gfx::Size(100, 100));

- client.set_tree(ACTIVE_TREE);

- tiling = TestablePictureLayerTiling::Create(1.0f, // contents_scale

- gfx::Size(100, 100),

- &client);

- tiling->UpdateTilePriorities(

- ACTIVE_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion());

- std::vector<scoped_refptr<Tile> > tiles = tiling->AllRefTilesForTesting();

- ASSERT_GT(tiles.size(), 0u);

- for (std::vector<scoped_refptr<Tile> >::const_iterator it = tiles.begin();

- it != tiles.end();

- ++it) {

- EXPECT_NE(TilePriority(), (*it)->priority(ACTIVE_TREE));

- }

- tiling->Reset();

- for (std::vector<scoped_refptr<Tile> >::const_iterator it = tiles.begin();

- it != tiles.end();

- ++it) {

- EXPECT_EQ(TilePriority(), (*it)->priority(ACTIVE_TREE));

- }

- tiles.clear();

TEST(PictureLayerTilingTest, RecycledTilesCleared) {

// This test performs the following:

// Setup:

« cc/resources/picture_layer_tiling_set.cc ('K') | « cc/resources/picture_layer_tiling_set.cc ('k') | cc/resources/prioritized_tile_set.h » ('j') | cc/resources/tile.h » ('J')