Chromium Code Reviews| 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 401df7e2710c3c5a76c202a9331ac12463fe8245..2bb79e064fe0faf91e2d6dbd6e41ec51209801d3 100644 |
| --- a/cc/layers/picture_layer_impl_unittest.cc |
| +++ b/cc/layers/picture_layer_impl_unittest.cc |
| @@ -319,11 +319,15 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| SetupDrawPropertiesAndUpdateTiles(active_layer_, 1.f, 1.f, 1.f, 1.f, false); |
| // UpdateTiles with valid viewport. Should update tile viewport. |
| + bool resourceless_software_draw = true; |
|
danakj
2014/07/09 17:21:07
why true? i just expected false for some reason..
boliu
2014/07/09 20:59:50
Yep, this is false after valid_for_tile_management
|
| bool valid_for_tile_management = true; |
| gfx::Rect viewport = gfx::Rect(layer_bounds); |
| gfx::Transform transform; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->draw_properties().visible_content_rect = viewport; |
| active_layer_->draw_properties().screen_space_transform = transform; |
| active_layer_->UpdateTiles(NULL); |
| @@ -346,8 +350,11 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| transform.Translate(1.f, 1.f); |
| active_layer_->draw_properties().visible_content_rect = viewport; |
| active_layer_->draw_properties().screen_space_transform = transform; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->UpdateTiles(NULL); |
| EXPECT_RECT_EQ(visible_rect_for_tile_priority, |
| @@ -362,8 +369,11 @@ TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| time_ticks += base::TimeDelta::FromMilliseconds(200); |
| host_impl_.SetCurrentFrameTimeTicks(time_ticks); |
| valid_for_tile_management = true; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->UpdateTiles(NULL); |
| EXPECT_FALSE(visible_rect_for_tile_priority == |
| @@ -391,10 +401,14 @@ TEST_F(PictureLayerImplTest, InvalidViewportAfterReleaseResources) { |
| Region invalidation; |
| AddDefaultTilingsWithInvalidation(invalidation); |
| + bool resourceless_software_draw = false; |
| bool valid_for_tile_management = false; |
| gfx::Rect viewport = gfx::Rect(layer_bounds); |
| - host_impl_.SetExternalDrawConstraints( |
| - gfx::Transform(), viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(gfx::Transform(), |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| ResetTilingsAndRasterScales(); |
| host_impl_.pending_tree()->UpdateDrawProperties(); |
| host_impl_.active_tree()->UpdateDrawProperties(); |
| @@ -2418,11 +2432,15 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| SetupDrawPropertiesAndUpdateTiles(active_layer_, 1.f, 1.f, 1.f, 1.f, false); |
| // UpdateTiles with valid viewport. Should update tile viewport. |
| + bool resourceless_software_draw = false; |
| bool valid_for_tile_management = true; |
| gfx::Rect viewport = gfx::Rect(layer_bounds); |
| gfx::Transform transform; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->draw_properties().visible_content_rect = viewport; |
| active_layer_->draw_properties().screen_space_transform = transform; |
| active_layer_->UpdateTiles(NULL); |
| @@ -2445,8 +2463,11 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| transform.Translate(1.f, 1.f); |
| active_layer_->draw_properties().visible_content_rect = viewport; |
| active_layer_->draw_properties().screen_space_transform = transform; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->UpdateTiles(NULL); |
| EXPECT_RECT_EQ(visible_rect_for_tile_priority, |
| @@ -2461,8 +2482,11 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) { |
| time_ticks += base::TimeDelta::FromMilliseconds(200); |
| host_impl_.SetCurrentFrameTimeTicks(time_ticks); |
| valid_for_tile_management = true; |
| - host_impl_.SetExternalDrawConstraints( |
| - transform, viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(transform, |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| active_layer_->UpdateTiles(NULL); |
| EXPECT_FALSE(visible_rect_for_tile_priority == |
| @@ -2490,10 +2514,14 @@ TEST_F(NoLowResPictureLayerImplTest, InvalidViewportAfterReleaseResources) { |
| Region invalidation; |
| AddDefaultTilingsWithInvalidation(invalidation); |
| + bool resourceless_software_draw = false; |
| bool valid_for_tile_management = false; |
| gfx::Rect viewport = gfx::Rect(layer_bounds); |
| - host_impl_.SetExternalDrawConstraints( |
| - gfx::Transform(), viewport, viewport, valid_for_tile_management); |
| + host_impl_.SetExternalDrawConstraints(gfx::Transform(), |
| + viewport, |
| + viewport, |
| + resourceless_software_draw, |
| + valid_for_tile_management); |
| ResetTilingsAndRasterScales(); |
| host_impl_.pending_tree()->UpdateDrawProperties(); |
| host_impl_.active_tree()->UpdateDrawProperties(); |