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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 394113002: Tiling priorities in Android Webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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/layers/picture_layer_impl.cc ('K') | « cc/layers/picture_layer_impl.cc ('k') | cc/output/output_surface.h » ('j') | cc/output/output_surface_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 340c432b15467ef28d4212a5ce10ac228b7027d6..8ab6b41a000aba9a7d6eb6bc5156e1b42e0876c2 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -325,7 +325,7 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
gfx::Rect viewport = gfx::Rect(layer_bounds);
gfx::Transform transform;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->draw_properties().visible_content_rect = viewport;
active_layer_->draw_properties().screen_space_transform = transform;
active_layer_->UpdateTiles(NULL);
@@ -333,9 +333,9 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
gfx::Rect visible_rect_for_tile_priority =
active_layer_->visible_rect_for_tile_priority();
EXPECT_FALSE(visible_rect_for_tile_priority.IsEmpty());
- gfx::Size viewport_size_for_tile_priority =
- active_layer_->viewport_size_for_tile_priority();
- EXPECT_FALSE(viewport_size_for_tile_priority.IsEmpty());
+ gfx::Rect viewport_rect_for_tile_priority =
+ active_layer_->viewport_rect_for_tile_priority();
+ EXPECT_FALSE(viewport_rect_for_tile_priority.IsEmpty());
gfx::Transform screen_space_transform_for_tile_priority =
active_layer_->screen_space_transform_for_tile_priority();
@@ -349,13 +349,13 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
active_layer_->draw_properties().visible_content_rect = viewport;
active_layer_->draw_properties().screen_space_transform = transform;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->UpdateTiles(NULL);
EXPECT_RECT_EQ(visible_rect_for_tile_priority,
active_layer_->visible_rect_for_tile_priority());
- EXPECT_SIZE_EQ(viewport_size_for_tile_priority,
- active_layer_->viewport_size_for_tile_priority());
+ EXPECT_RECT_EQ(viewport_rect_for_tile_priority,
+ active_layer_->viewport_rect_for_tile_priority());
EXPECT_TRANSFORMATION_MATRIX_EQ(
screen_space_transform_for_tile_priority,
active_layer_->screen_space_transform_for_tile_priority());
@@ -365,13 +365,13 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
host_impl_.SetCurrentFrameTimeTicks(time_ticks);
resourceless_software_draw = false;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->UpdateTiles(NULL);
EXPECT_FALSE(visible_rect_for_tile_priority ==
active_layer_->visible_rect_for_tile_priority());
- EXPECT_FALSE(viewport_size_for_tile_priority ==
- active_layer_->viewport_size_for_tile_priority());
+ EXPECT_FALSE(viewport_rect_for_tile_priority ==
+ active_layer_->viewport_rect_for_tile_priority());
EXPECT_FALSE(screen_space_transform_for_tile_priority ==
active_layer_->screen_space_transform_for_tile_priority());
}
@@ -395,8 +395,11 @@ TEST_F(PictureLayerImplTest, InvalidViewportAfterReleaseResources) {
bool resourceless_software_draw = true;
gfx::Rect viewport = gfx::Rect(layer_bounds);
- host_impl_.SetExternalDrawConstraints(
- gfx::Transform(), viewport, viewport, resourceless_software_draw);
+ host_impl_.SetExternalDrawConstraints(gfx::Transform(),
+ viewport,
+ viewport,
+ viewport,
+ resourceless_software_draw);
ResetTilingsAndRasterScales();
host_impl_.pending_tree()->UpdateDrawProperties();
host_impl_.active_tree()->UpdateDrawProperties();
@@ -2516,7 +2519,7 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
gfx::Rect viewport = gfx::Rect(layer_bounds);
gfx::Transform transform;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->draw_properties().visible_content_rect = viewport;
active_layer_->draw_properties().screen_space_transform = transform;
active_layer_->UpdateTiles(NULL);
@@ -2524,9 +2527,9 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
gfx::Rect visible_rect_for_tile_priority =
active_layer_->visible_rect_for_tile_priority();
EXPECT_FALSE(visible_rect_for_tile_priority.IsEmpty());
- gfx::Size viewport_size_for_tile_priority =
- active_layer_->viewport_size_for_tile_priority();
- EXPECT_FALSE(viewport_size_for_tile_priority.IsEmpty());
+ gfx::Rect viewport_rect_for_tile_priority =
+ active_layer_->viewport_rect_for_tile_priority();
+ EXPECT_FALSE(viewport_rect_for_tile_priority.IsEmpty());
gfx::Transform screen_space_transform_for_tile_priority =
active_layer_->screen_space_transform_for_tile_priority();
@@ -2540,13 +2543,13 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
active_layer_->draw_properties().visible_content_rect = viewport;
active_layer_->draw_properties().screen_space_transform = transform;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->UpdateTiles(NULL);
EXPECT_RECT_EQ(visible_rect_for_tile_priority,
active_layer_->visible_rect_for_tile_priority());
- EXPECT_SIZE_EQ(viewport_size_for_tile_priority,
- active_layer_->viewport_size_for_tile_priority());
+ EXPECT_RECT_EQ(viewport_rect_for_tile_priority,
+ active_layer_->viewport_rect_for_tile_priority());
EXPECT_TRANSFORMATION_MATRIX_EQ(
screen_space_transform_for_tile_priority,
active_layer_->screen_space_transform_for_tile_priority());
@@ -2556,13 +2559,13 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
host_impl_.SetCurrentFrameTimeTicks(time_ticks);
resourceless_software_draw = false;
host_impl_.SetExternalDrawConstraints(
- transform, viewport, viewport, resourceless_software_draw);
+ transform, viewport, viewport, viewport, resourceless_software_draw);
active_layer_->UpdateTiles(NULL);
EXPECT_FALSE(visible_rect_for_tile_priority ==
active_layer_->visible_rect_for_tile_priority());
- EXPECT_FALSE(viewport_size_for_tile_priority ==
- active_layer_->viewport_size_for_tile_priority());
+ EXPECT_FALSE(viewport_rect_for_tile_priority ==
+ active_layer_->viewport_rect_for_tile_priority());
EXPECT_FALSE(screen_space_transform_for_tile_priority ==
active_layer_->screen_space_transform_for_tile_priority());
}
@@ -2586,8 +2589,11 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportAfterReleaseResources) {
bool resourceless_software_draw = true;
gfx::Rect viewport = gfx::Rect(layer_bounds);
- host_impl_.SetExternalDrawConstraints(
- gfx::Transform(), viewport, viewport, resourceless_software_draw);
+ host_impl_.SetExternalDrawConstraints(gfx::Transform(),
+ viewport,
+ viewport,
+ viewport,
+ resourceless_software_draw);
ResetTilingsAndRasterScales();
host_impl_.pending_tree()->UpdateDrawProperties();
host_impl_.active_tree()->UpdateDrawProperties();
« cc/layers/picture_layer_impl.cc ('K') | « cc/layers/picture_layer_impl.cc ('k') | cc/output/output_surface.h » ('j') | cc/output/output_surface_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698