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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/picture_layer_tiling_unittest.cc

Issue 732423002: Update from chromium https://crrev.com/304586 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/resources/picture_layer_tiling_set_unittest.cc ('k') | cc/resources/picture_pile.h » ('j') | no next file with comments »
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 786f943e16727ea452c7a4ded693813911556bf6..b982dc195f2d41b334873a79d50a0bd12e35fedb 100644
--- a/cc/resources/picture_layer_tiling_unittest.cc
+++ b/cc/resources/picture_layer_tiling_unittest.cc
@@ -36,16 +36,13 @@ static gfx::Rect ViewportInLayerSpace(
}
static void UpdateAllTilePriorities(PictureLayerTilingSet* set,
- WhichTree tree,
const gfx::Rect& visible_layer_rect,
float layer_contents_scale,
double current_frame_time_in_seconds) {
for (size_t i = 0; i < set->num_tilings(); ++i) {
- set->tiling_at(i)->ComputeTilePriorityRects(tree,
- visible_layer_rect,
- layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ set->tiling_at(i)
+ ->ComputeTilePriorityRects(visible_layer_rect, layer_contents_scale,
+ current_frame_time_in_seconds, Occlusion());
}
}
@@ -211,7 +208,8 @@ TEST_F(PictureLayerTilingIteratorTest, ResizeDeletesTiles) {
Region invalidation =
SubtractRegions(gfx::Rect(tile_size), gfx::Rect(original_layer_size));
- tiling_->UpdateTilesToCurrentRasterSource(invalidation, gfx::Size(200, 200));
+ tiling_->UpdateTilesToCurrentRasterSource(client_.raster_source(),
+ invalidation, gfx::Size(200, 200));
EXPECT_FALSE(tiling_->TileAt(0, 0));
}
@@ -266,8 +264,8 @@ TEST_F(PictureLayerTilingIteratorTest, ResizeTilingOverTileBorders) {
// Shrink the tiling so that the last tile row/column is entirely in the
// border pixels of the interior tiles. That row/column is removed.
Region invalidation;
- tiling_->UpdateTilesToCurrentRasterSource(invalidation,
- gfx::Size(right + 1, bottom + 1));
+ tiling_->UpdateTilesToCurrentRasterSource(
+ client_.raster_source(), invalidation, gfx::Size(right + 1, bottom + 1));
EXPECT_EQ(2, tiling_->TilingDataForTesting().num_tiles_x());
EXPECT_EQ(3, tiling_->TilingDataForTesting().num_tiles_y());
@@ -284,8 +282,8 @@ TEST_F(PictureLayerTilingIteratorTest, ResizeTilingOverTileBorders) {
// Growing outside the current right/bottom tiles border pixels should create
// the tiles again, even though the live rect has not changed size.
- tiling_->UpdateTilesToCurrentRasterSource(invalidation,
- gfx::Size(right + 2, bottom + 2));
+ tiling_->UpdateTilesToCurrentRasterSource(
+ client_.raster_source(), invalidation, gfx::Size(right + 2, bottom + 2));
EXPECT_EQ(3, tiling_->TilingDataForTesting().num_tiles_x());
EXPECT_EQ(4, tiling_->TilingDataForTesting().num_tiles_y());
@@ -421,7 +419,8 @@ TEST_F(PictureLayerTilingIteratorTest, ResizeOverBorderPixelsDeletesTiles) {
Region invalidation =
SubtractRegions(gfx::Rect(tile_size), gfx::Rect(original_layer_size));
- tiling_->UpdateTilesToCurrentRasterSource(invalidation, gfx::Size(200, 200));
+ tiling_->UpdateTilesToCurrentRasterSource(client_.raster_source(),
+ invalidation, gfx::Size(200, 200));
EXPECT_FALSE(tiling_->TileAt(0, 0));
// The original tile was the same size after resize, but it would include new
@@ -543,8 +542,7 @@ TEST(PictureLayerTilingTest, SkewportLimits) {
client.SetTileSize(gfx::Size(100, 100));
tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.f, 1.0, Occlusion());
// Move viewport down 50 pixels in 0.5 seconds.
gfx::Rect down_skewport =
@@ -610,8 +608,7 @@ TEST(PictureLayerTilingTest, ComputeSkewport) {
client.set_tree(ACTIVE_TREE);
tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.f, 1.0, Occlusion());
// Move viewport down 50 pixels in 0.5 seconds.
gfx::Rect down_skewport =
@@ -678,8 +675,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
gfx::Rect viewport_in_content_space =
gfx::ToEnclosedRect(gfx::ScaleRect(viewport, 0.25f));
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.f, 1.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
gfx::Rect soon_rect = viewport;
@@ -764,8 +760,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
EXPECT_EQ(25, skewport.width());
EXPECT_EQ(35, skewport.height());
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.f, 2.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.f, 2.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
have_now = false;
@@ -817,8 +812,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
EXPECT_FLOAT_EQ(4.f, priority.distance_to_visible);
// Change the underlying layer scale.
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 2.0f, 3.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 2.0f, 3.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
@@ -832,8 +826,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
// Test additional scales.
tiling = TestablePictureLayerTiling::Create(0.2f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.0f, 4.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.0f, 4.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
@@ -845,8 +838,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
priority = tiling->TileAt(3, 4)->priority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(60.f, priority.distance_to_visible);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 0.5f, 5.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 0.5f, 5.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
priority = tiling->TileAt(5, 1)->priority(ACTIVE_TREE);
@@ -1095,8 +1087,7 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorStaticViewport) {
client.set_tree(ACTIVE_TREE);
tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.0f, 1.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
PictureLayerTiling::TilingRasterTileIterator empty_iterator;
@@ -1201,10 +1192,8 @@ TEST(PictureLayerTilingTest, TilingRasterTileIteratorMovingViewport) {
client.set_tree(ACTIVE_TREE);
tiling = TestablePictureLayerTiling::Create(1.f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, moved_viewport, 1.0f, 2.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.0f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(moved_viewport, 1.0f, 2.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
gfx::Rect soon_rect = moved_viewport;
@@ -1276,8 +1265,7 @@ TEST(PictureLayerTilingTest, TilingEvictionTileIteratorStaticViewport) {
client.set_tree(ACTIVE_TREE);
tiling = TestablePictureLayerTiling::Create(1.0f, layer_bounds, &client);
- tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
+ tiling->ComputeTilePriorityRects(viewport, 1.0f, 1.0, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
PictureLayerTiling::TilingRasterTileIterator empty_iterator;
@@ -1363,7 +1351,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExist) {
client_.set_tree(ACTIVE_TREE);
tiling_->ComputeTilePriorityRects(
- ACTIVE_TREE,
gfx::Rect(layer_bounds), // visible content rect
1.f, // current contents scale
1.0, // current frame time
@@ -1371,8 +1358,7 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExist) {
VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
// Make the viewport rect empty. All tiles are killed and become zombies.
- tiling_->ComputeTilePriorityRects(ACTIVE_TREE,
- gfx::Rect(), // visible content rect
+ tiling_->ComputeTilePriorityRects(gfx::Rect(), // visible content rect
1.f, // current contents scale
2.0, // current frame time
Occlusion());
@@ -1389,7 +1375,6 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistGiantViewport) {
client_.set_tree(ACTIVE_TREE);
tiling_->ComputeTilePriorityRects(
- ACTIVE_TREE,
gfx::Rect(layer_bounds), // visible content rect
1.f, // current contents scale
1.0, // current frame time
@@ -1397,8 +1382,7 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistGiantViewport) {
VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
// If the visible content rect is empty, it should still have live tiles.
- tiling_->ComputeTilePriorityRects(ACTIVE_TREE,
- giant_rect, // visible content rect
+ tiling_->ComputeTilePriorityRects(giant_rect, // visible content rect
1.f, // current contents scale
2.0, // current frame time
Occlusion());
@@ -1417,8 +1401,7 @@ TEST_F(PictureLayerTilingIteratorTest, TilesExistOutsideViewport) {
EXPECT_FALSE(viewport_rect.Intersects(gfx::Rect(layer_bounds)));
client_.set_tree(ACTIVE_TREE);
- tiling_->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_rect, // visible content rect
+ tiling_->ComputeTilePriorityRects(viewport_rect, // visible content rect
1.f, // current contents scale
1.0, // current frame time
Occlusion());
@@ -1447,8 +1430,7 @@ TEST_F(PictureLayerTilingIteratorTest,
client_.set_tree(ACTIVE_TREE);
set_max_tiles_for_interest_area(1);
- tiling_->ComputeTilePriorityRects(ACTIVE_TREE,
- visible_rect, // visible content rect
+ tiling_->ComputeTilePriorityRects(visible_rect, // visible content rect
1.f, // current contents scale
1.0, // current frame time
Occlusion());
@@ -1464,49 +1446,40 @@ TEST_F(PictureLayerTilingIteratorTest, AddTilingsToMatchScale) {
client_.SetTileSize(tile_size);
client_.set_tree(PENDING_TREE);
- PictureLayerTilingSet active_set(&client_);
+ auto active_set = PictureLayerTilingSet::Create(&client_);
- active_set.AddTiling(1.f, layer_bounds);
+ active_set->AddTiling(1.f, layer_bounds);
- VerifyTiles(active_set.tiling_at(0),
- 1.f,
- gfx::Rect(layer_bounds),
+ VerifyTiles(active_set->tiling_at(0), 1.f, gfx::Rect(layer_bounds),
base::Bind(&TileExists, false));
- UpdateAllTilePriorities(&active_set,
- PENDING_TREE,
+ UpdateAllTilePriorities(active_set.get(),
gfx::Rect(layer_bounds), // visible content rect
1.f, // current contents scale
1.0); // current frame time
// The active tiling has tiles now.
- VerifyTiles(active_set.tiling_at(0),
- 1.f,
- gfx::Rect(layer_bounds),
+ VerifyTiles(active_set->tiling_at(0), 1.f, gfx::Rect(layer_bounds),
base::Bind(&TileExists, true));
// Add the same tilings to the pending set.
- PictureLayerTilingSet pending_set(&client_);
+ auto pending_set = PictureLayerTilingSet::Create(&client_);
Region invalidation;
- pending_set.SyncTilings(active_set, layer_bounds, invalidation, 0.f);
+ pending_set->SyncTilings(*active_set, layer_bounds, invalidation, 0.f,
+ client_.raster_source());
// The pending tiling starts with no tiles.
- VerifyTiles(pending_set.tiling_at(0),
- 1.f,
- gfx::Rect(layer_bounds),
+ VerifyTiles(pending_set->tiling_at(0), 1.f, gfx::Rect(layer_bounds),
base::Bind(&TileExists, false));
// ComputeTilePriorityRects on the pending tiling at the same frame time. The
// pending tiling should get tiles.
- UpdateAllTilePriorities(&pending_set,
- PENDING_TREE,
+ UpdateAllTilePriorities(pending_set.get(),
gfx::Rect(layer_bounds), // visible content rect
1.f, // current contents scale
1.0); // current frame time
- VerifyTiles(pending_set.tiling_at(0),
- 1.f,
- gfx::Rect(layer_bounds),
+ VerifyTiles(pending_set->tiling_at(0), 1.f, gfx::Rect(layer_bounds),
base::Bind(&TileExists, true));
}
@@ -1533,11 +1506,9 @@ TEST(ComputeTilePriorityRectsTest, VisibleTiles) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1589,11 +1560,9 @@ TEST(ComputeTilePriorityRectsTest, OffscreenTiles) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1655,11 +1624,9 @@ TEST(ComputeTilePriorityRectsTest, PartiallyOffscreenLayer) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1715,11 +1682,9 @@ TEST(ComputeTilePriorityRectsTest, PartiallyOffscreenRotatedLayer) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1799,11 +1764,9 @@ TEST(ComputeTilePriorityRectsTest, PerspectiveLayer) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1893,11 +1856,9 @@ TEST(ComputeTilePriorityRectsTest, PerspectiveLayerClippedByW) {
current_layer_bounds,
&client);
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -1958,18 +1919,14 @@ TEST(ComputeTilePriorityRectsTest, BasicMotion) {
&client);
// previous ("last") frame
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
last_layer_contents_scale,
- last_frame_time_in_seconds,
- Occlusion());
+ last_frame_time_in_seconds, Occlusion());
// current frame
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -2037,18 +1994,14 @@ TEST(ComputeTilePriorityRectsTest, RotationMotion) {
&client);
// previous ("last") frame
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
last_layer_contents_scale,
- last_frame_time_in_seconds,
- Occlusion());
+ last_frame_time_in_seconds, Occlusion());
// current frame
- tiling->ComputeTilePriorityRects(ACTIVE_TREE,
- viewport_in_layer_space,
+ tiling->ComputeTilePriorityRects(viewport_in_layer_space,
current_layer_contents_scale,
- current_frame_time_in_seconds,
- Occlusion());
+ current_frame_time_in_seconds, Occlusion());
tiling->UpdateAllTilePrioritiesForTesting();
ASSERT_TRUE(tiling->TileAt(0, 0));
@@ -2090,8 +2043,8 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) {
gfx::Size(10000, 10000),
&active_client);
// Create all tiles on this tiling.
- active_tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion());
+ active_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f,
+ Occlusion());
FakePictureLayerTilingClient recycle_client;
recycle_client.SetTileSize(gfx::Size(100, 100));
@@ -2105,8 +2058,8 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) {
&recycle_client);
// Create all tiles on the second tiling. All tiles should be shared.
- recycle_tiling->ComputeTilePriorityRects(
- PENDING_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion());
+ recycle_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f,
+ 1.0f, Occlusion());
// Set the second tiling as recycled.
active_client.set_twin_tiling(NULL);
@@ -2119,15 +2072,15 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) {
EXPECT_EQ(active_tiling->TileAt(0, 0), recycle_tiling->TileAt(0, 0));
// Move the viewport far away from the (0, 0) tile.
- active_tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, gfx::Rect(9000, 9000, 100, 100), 1.0f, 2.0, Occlusion());
+ active_tiling->ComputeTilePriorityRects(gfx::Rect(9000, 9000, 100, 100), 1.0f,
+ 2.0, Occlusion());
// Ensure the tile was deleted on both tilings.
EXPECT_FALSE(active_tiling->TileAt(0, 0));
EXPECT_FALSE(recycle_tiling->TileAt(0, 0));
// Move the viewport back to (0, 0) tile.
- active_tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 3.0, Occlusion());
+ active_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f, 3.0,
+ Occlusion());
// Ensure that we now have a tile here, but the recycle tiling does not.
EXPECT_TRUE(active_tiling->TileAt(0, 0));
@@ -2144,8 +2097,8 @@ TEST(PictureLayerTilingTest, RecycledTilesClearedOnReset) {
gfx::Size(100, 100),
&active_client);
// Create all tiles on this tiling.
- active_tiling->ComputeTilePriorityRects(
- ACTIVE_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion());
+ active_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f,
+ Occlusion());
FakePictureLayerTilingClient recycle_client;
recycle_client.SetTileSize(gfx::Size(100, 100));
@@ -2159,8 +2112,8 @@ TEST(PictureLayerTilingTest, RecycledTilesClearedOnReset) {
&recycle_client);
// Create all tiles on the recycle tiling. All tiles should be shared.
- recycle_tiling->ComputeTilePriorityRects(
- PENDING_TREE, gfx::Rect(0, 0, 100, 100), 1.0f, 1.0f, Occlusion());
+ recycle_tiling->ComputeTilePriorityRects(gfx::Rect(0, 0, 100, 100), 1.0f,
+ 1.0f, Occlusion());
// Set the second tiling as recycled.
active_client.set_twin_tiling(NULL);
@@ -2194,7 +2147,8 @@ TEST_F(PictureLayerTilingIteratorTest, ResizeTilesAndUpdateToCurrent) {
EXPECT_EQ(100, tiling_->TilingDataForTesting().max_texture_size().height());
Region invalidation;
- tiling_->UpdateTilesToCurrentRasterSource(invalidation, gfx::Size(250, 150));
+ tiling_->UpdateTilesToCurrentRasterSource(client_.raster_source(),
+ invalidation, gfx::Size(250, 150));
// Tile size in the tiling should be resized to 250x200.
EXPECT_EQ(250, tiling_->TilingDataForTesting().max_texture_size().width());
« no previous file with comments | « cc/resources/picture_layer_tiling_set_unittest.cc ('k') | cc/resources/picture_pile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698