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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 6 years, 4 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
« cc/resources/picture_layer_tiling.cc ('K') | « cc/resources/picture_layer_tiling_set.cc ('k') | cc/resources/prioritized_tile_set.h » ('j') | cc/resources/tile_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 032ffec15462ba9967eea16a5be71e958db7c3fd..f61112e77da0fd3ec42160a608c2f799fe737ca4 100644
--- a/cc/resources/picture_layer_tiling_unittest.cc
+++ b/cc/resources/picture_layer_tiling_unittest.cc
@@ -485,6 +485,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
tiling->UpdateTilePriorities(
ACTIVE_TREE, viewport, 1.f, 1.0, NULL, NULL, gfx::Transform());
+ tiling->UpdateAllTilePrioritiesForTesting();
gfx::Rect soon_rect = viewport;
soon_rect.Inset(-312.f, -312.f, -312.f, -312.f);
@@ -533,23 +534,23 @@ 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.
// We can verify that the content rect (with borders) is one pixel off
// 41,9 8x8 on all sides.
EXPECT_EQ(tiling->TileAt(5, 1)->content_rect().ToString(), "40,8 10x10");
TilePriority priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(68.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(64.f, priority.distance_to_visible);
priority = tiling->TileAt(2, 5)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(68.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(64.f, priority.distance_to_visible);
priority = tiling->TileAt(3, 4)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(40.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(32.f, priority.distance_to_visible);
// Move the viewport down 40 pixels.
viewport = gfx::Rect(0, 40, 100, 100);
@@ -569,6 +570,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
tiling->UpdateTilePriorities(
ACTIVE_TREE, viewport, 1.f, 2.0, NULL, NULL, gfx::Transform());
+ tiling->UpdateAllTilePrioritiesForTesting();
have_now = false;
have_eventually = false;
@@ -609,10 +611,10 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
EXPECT_TRUE(have_eventually);
priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(68.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(64.f, priority.distance_to_visible);
priority = tiling->TileAt(2, 5)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(28.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(24.f, priority.distance_to_visible);
priority = tiling->TileAt(3, 4)->priority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible);
@@ -620,12 +622,13 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
// Change the underlying layer scale.
tiling->UpdateTilePriorities(
ACTIVE_TREE, viewport, 2.0f, 3.0, NULL, NULL, gfx::Transform());
+ tiling->UpdateAllTilePrioritiesForTesting();
priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(34.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(32.f, priority.distance_to_visible);
priority = tiling->TileAt(2, 5)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(14.f, priority.distance_to_visible);
+ EXPECT_FLOAT_EQ(12.f, priority.distance_to_visible);
priority = tiling->TileAt(3, 4)->priority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible);
@@ -1347,6 +1350,7 @@ TEST(UpdateTilePrioritiesTest, VisibleTiles) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1404,6 +1408,7 @@ TEST(UpdateTilePrioritiesTest, OffscreenTiles) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1471,6 +1476,7 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenLayer) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1532,6 +1538,7 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenRotatedLayer) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1617,6 +1624,7 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayer) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1712,6 +1720,7 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayerClippedByW) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1787,6 +1796,7 @@ TEST(UpdateTilePrioritiesTest, BasicMotion) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1869,6 +1879,7 @@ TEST(UpdateTilePrioritiesTest, RotationMotion) {
NULL, // occlusion tracker
NULL, // render target
gfx::Transform()); // draw transform
+ tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
ASSERT_TRUE(tiling->TileAt(0, 1));
@@ -1888,39 +1899,5 @@ 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,
- NULL, // occlusion tracker
- NULL, // render target
- gfx::Transform()); // draw transform
-
- 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();
-}
-
} // namespace
} // namespace cc
« cc/resources/picture_layer_tiling.cc ('K') | « cc/resources/picture_layer_tiling_set.cc ('k') | cc/resources/prioritized_tile_set.h » ('j') | cc/resources/tile_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698