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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/picture_layer_tiling_unittest.cc

Issue 62283012: cc: Added tile bundles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: perftest fix Created 7 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
« cc/resources/picture_layer_tiling.cc ('K') | « cc/resources/picture_layer_tiling_set_unittest.cc ('k') | cc/resources/prioritized_tile_set_unittest.cc » ('j') | cc/resources/tile_bundle.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 6adc61164548d426416a27156d9c5e4048207160..ce129727f9cb9ac522a8ccf147f2fe05420f44ff 100644
--- a/cc/resources/picture_layer_tiling_unittest.cc
+++ b/cc/resources/picture_layer_tiling_unittest.cc
@@ -34,6 +34,7 @@ class TestablePictureLayerTiling : public PictureLayerTiling {
public:
using PictureLayerTiling::SetLiveTilesRect;
using PictureLayerTiling::TileAt;
+ using PictureLayerTiling::TileBundleAt;
static scoped_ptr<TestablePictureLayerTiling> Create(
float contents_scale,
@@ -61,13 +62,14 @@ class PictureLayerTilingIteratorTest : public testing::Test {
float contents_scale,
gfx::Size layer_bounds) {
client_.SetTileSize(tile_size);
+ client_.MarkActive();
tiling_ = TestablePictureLayerTiling::Create(contents_scale,
layer_bounds,
&client_);
}
void SetLiveRectAndVerifyTiles(gfx::Rect live_tiles_rect) {
- tiling_->SetLiveTilesRect(live_tiles_rect);
+ tiling_->SetLiveTilesRect(ACTIVE_TREE, live_tiles_rect);
std::vector<Tile*> tiles = tiling_->AllTilesForTesting();
for (std::vector<Tile*>::iterator iter = tiles.begin();
@@ -772,24 +774,13 @@ TEST(UpdateTilePrioritiesTest, VisibleTiles) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 1));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
- EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
-
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
- EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
-
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
- EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
- EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
-
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
}
@@ -803,8 +794,8 @@ TEST(UpdateTilePrioritiesTest, OffscreenTiles) {
gfx::Size device_viewport(800, 600);
gfx::Rect visible_layer_rect(0, 0, 0, 0); // offscreen; nothing is visible.
- gfx::Size last_layer_bounds(200, 200);
- gfx::Size current_layer_bounds(200, 200);
+ gfx::Size last_layer_bounds(400, 400);
+ gfx::Size current_layer_bounds(400, 400);
float last_layer_contents_scale = 1.f;
float current_layer_contents_scale = 1.f;
gfx::Transform last_screen_transform;
@@ -837,40 +828,34 @@ TEST(UpdateTilePrioritiesTest, OffscreenTiles) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
-
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
- EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
- EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
- priority.time_to_visible_in_seconds);
-
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
- EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
- EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
- priority.time_to_visible_in_seconds);
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 1));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
- EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
- EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
- priority.time_to_visible_in_seconds);
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 2, 2));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 2, 3));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 3, 2));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 3, 3));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
- // Furthermore, in this scenario tiles on the right hand side should have a
+ // Furthermore, in this scenario bundles on the right hand side should have a
// larger distance to visible.
- TilePriority left = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
- TilePriority right = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ TilePriority left = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
+ TilePriority right = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(right.distance_to_visible_in_pixels,
left.distance_to_visible_in_pixels);
- left = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
- right = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ left = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
+ right = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(right.distance_to_visible_in_pixels,
left.distance_to_visible_in_pixels);
}
@@ -884,8 +869,8 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenLayer) {
gfx::Size device_viewport(800, 600);
gfx::Rect visible_layer_rect(0, 0, 100, 100); // only top quarter.
- gfx::Size last_layer_bounds(200, 200);
- gfx::Size current_layer_bounds(200, 200);
+ gfx::Size last_layer_bounds(400, 400);
+ gfx::Size current_layer_bounds(400, 400);
float last_layer_contents_scale = 1.f;
float current_layer_contents_scale = 1.f;
gfx::Transform last_screen_transform;
@@ -918,26 +903,30 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenLayer) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 0, 1));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 0));
+ ASSERT_TRUE(tiling->TileAt(ACTIVE_TREE, 1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
@@ -953,8 +942,8 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenRotatedLayer) {
gfx::Size device_viewport(800, 600);
gfx::Rect visible_layer_rect(0, 0, 100, 100); // only top-left quarter.
- gfx::Size last_layer_bounds(200, 200);
- gfx::Size current_layer_bounds(200, 200);
+ gfx::Size last_layer_bounds(400, 400);
+ gfx::Size current_layer_bounds(400, 400);
float last_layer_contents_scale = 1.f;
float current_layer_contents_scale = 1.f;
gfx::Transform last_screen_transform;
@@ -990,36 +979,38 @@ TEST(UpdateTilePrioritiesTest, PartiallyOffscreenRotatedLayer) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
// Furthermore, in this scenario the bottom-right tile should have the larger
// distance to visible.
- TilePriority top_left = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
- TilePriority top_right = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
- TilePriority bottom_left = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
- TilePriority bottom_right = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ TilePriority top_left = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
+ TilePriority top_right = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
+ TilePriority bottom_left =
+ tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
+ TilePriority bottom_right =
+ tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(top_right.distance_to_visible_in_pixels,
top_left.distance_to_visible_in_pixels);
EXPECT_GT(bottom_left.distance_to_visible_in_pixels,
@@ -1040,8 +1031,8 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayer) {
gfx::Size device_viewport(800, 600);
gfx::Rect visible_layer_rect(0, 0, 0, 0); // offscreen.
- gfx::Size last_layer_bounds(200, 200);
- gfx::Size current_layer_bounds(200, 200);
+ gfx::Size last_layer_bounds(400, 400);
+ gfx::Size current_layer_bounds(400, 400);
float last_layer_contents_scale = 1.f;
float current_layer_contents_scale = 1.f;
gfx::Transform last_screen_transform;
@@ -1092,29 +1083,29 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayer) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
// All tiles will have a positive distance_to_visible
// and an infinite time_to_visible.
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
@@ -1122,10 +1113,12 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayer) {
// Furthermore, in this scenario the top-left distance_to_visible
// will be smallest, followed by top-right. The bottom layers
// will of course be further than the top layers.
- TilePriority top_left = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
- TilePriority top_right = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
- TilePriority bottom_left = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
- TilePriority bottom_right = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ TilePriority top_left = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
+ TilePriority top_right = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
+ TilePriority bottom_left =
+ tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
+ TilePriority bottom_right =
+ tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(top_right.distance_to_visible_in_pixels,
top_left.distance_to_visible_in_pixels);
@@ -1145,8 +1138,8 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayerClippedByW) {
gfx::Size device_viewport(800, 600);
gfx::Rect visible_layer_rect(0, 0, 0, 0); // offscreen.
- gfx::Size last_layer_bounds(200, 200);
- gfx::Size current_layer_bounds(200, 200);
+ gfx::Size last_layer_bounds(400, 400);
+ gfx::Size current_layer_bounds(400, 400);
float last_layer_contents_scale = 1.f;
float current_layer_contents_scale = 1.f;
gfx::Transform last_screen_transform;
@@ -1162,22 +1155,22 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayerClippedByW) {
// Translate layer to offscreen
current_screen_transform.Translate(400.0, 970.0);
// Apply perspective and rotation about the center of the layer
- current_screen_transform.Translate(100.0, 100.0);
+ current_screen_transform.Translate(200.0, 200.0);
current_screen_transform.ApplyPerspectiveDepth(10.0);
current_screen_transform.RotateAboutYAxis(10.0);
- current_screen_transform.Translate(-100.0, -100.0);
+ current_screen_transform.Translate(-200.0, -200.0);
last_screen_transform = current_screen_transform;
// Sanity check that this transform does cause w<0 clipping for the left side
// of the layer, but not the right side.
bool clipped;
MathUtil::MapQuad(current_screen_transform,
- gfx::QuadF(gfx::RectF(0, 0, 100, 200)),
+ gfx::QuadF(gfx::RectF(0, 0, 200, 400)),
&clipped);
ASSERT_TRUE(clipped);
MathUtil::MapQuad(current_screen_transform,
- gfx::QuadF(gfx::RectF(100, 0, 100, 200)),
+ gfx::QuadF(gfx::RectF(200, 0, 200, 400)),
&clipped);
ASSERT_FALSE(clipped);
@@ -1203,29 +1196,29 @@ TEST(UpdateTilePrioritiesTest, PerspectiveLayerClippedByW) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
// Left-side tiles will be clipped by the transform, so we have to assume
// they are visible just in case.
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
// Right-side tiles will have a positive distance_to_visible
// and an infinite time_to_visible.
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
@@ -1257,7 +1250,7 @@ TEST(UpdateTilePrioritiesTest, BasicMotion) {
gfx::Rect viewport_in_layer_space = ViewportInLayerSpace(
current_screen_transform, device_viewport);
- client.SetTileSize(gfx::Size(100, 100));
+ client.SetTileSize(gfx::Size(50, 50));
tiling = TestablePictureLayerTiling::Create(1.0f, // contents_scale
current_layer_bounds,
&client);
@@ -1292,29 +1285,29 @@ TEST(UpdateTilePrioritiesTest, BasicMotion) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(1.f,
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(1.f,
priority.time_to_visible_in_seconds);
// time_to_visible for the right hand side layers needs an extra 0.099
// seconds because this tile is 99 pixels further away.
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(1.099f,
priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(1, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(1.099f,
priority.time_to_visible_in_seconds);
@@ -1355,7 +1348,7 @@ TEST(UpdateTilePrioritiesTest, RotationMotion) {
gfx::Rect viewport_in_layer_space = ViewportInLayerSpace(
current_screen_transform, device_viewport);
- client.SetTileSize(gfx::Size(100, 100));
+ client.SetTileSize(gfx::Size(50, 50));
tiling = TestablePictureLayerTiling::Create(1.0f, // contents_scale
current_layer_bounds,
&client);
@@ -1390,20 +1383,20 @@ TEST(UpdateTilePrioritiesTest, RotationMotion) {
current_frame_time_in_seconds,
max_tiles_for_interest_area);
- ASSERT_TRUE(tiling->TileAt(0, 0));
- ASSERT_TRUE(tiling->TileAt(0, 1));
- ASSERT_TRUE(tiling->TileAt(1, 0));
- ASSERT_TRUE(tiling->TileAt(1, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(0, 1));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 0));
+ ASSERT_TRUE(tiling->TileBundleAt(1, 1));
- TilePriority priority = tiling->TileAt(0, 0)->priority(ACTIVE_TREE);
+ TilePriority priority = tiling->TileBundleAt(0, 0)->GetPriority(ACTIVE_TREE);
EXPECT_FLOAT_EQ(0.f, priority.distance_to_visible_in_pixels);
EXPECT_FLOAT_EQ(0.f, priority.time_to_visible_in_seconds);
- priority = tiling->TileAt(0, 1)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(0, 1)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_GT(priority.time_to_visible_in_seconds, 0.f);
- priority = tiling->TileAt(1, 0)->priority(ACTIVE_TREE);
+ priority = tiling->TileBundleAt(1, 0)->GetPriority(ACTIVE_TREE);
EXPECT_GT(priority.distance_to_visible_in_pixels, 0.f);
EXPECT_FLOAT_EQ(std::numeric_limits<float>::infinity(),
priority.time_to_visible_in_seconds);
« cc/resources/picture_layer_tiling.cc ('K') | « cc/resources/picture_layer_tiling_set_unittest.cc ('k') | cc/resources/prioritized_tile_set_unittest.cc » ('j') | cc/resources/tile_bundle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698