| Index: trunk/src/cc/layers/picture_layer_impl_unittest.cc
|
| ===================================================================
|
| --- trunk/src/cc/layers/picture_layer_impl_unittest.cc (revision 272659)
|
| +++ trunk/src/cc/layers/picture_layer_impl_unittest.cc (working copy)
|
| @@ -2391,61 +2391,5 @@
|
| EXPECT_BOTH_EQ(HighResTiling()->contents_scale(), 1.f);
|
| }
|
|
|
| -TEST_F(PictureLayerImplTest, LowResReadyToDrawNotEnoughToActivate) {
|
| - gfx::Size tile_size(100, 100);
|
| - gfx::Size layer_bounds(1000, 1000);
|
| -
|
| - SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size);
|
| -
|
| - // Make sure some tiles are not shared.
|
| - pending_layer_->set_invalidation(gfx::Rect(gfx::Point(50, 50), tile_size));
|
| -
|
| - CreateHighLowResAndSetAllTilesVisible();
|
| - active_layer_->SetAllTilesReady();
|
| - pending_layer_->MarkVisibleResourcesAsRequired();
|
| -
|
| - // All pending layer tiles required are not ready.
|
| - EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -
|
| - // Initialize all low-res tiles.
|
| - pending_layer_->SetAllTilesReadyInTiling(pending_layer_->LowResTiling());
|
| -
|
| - // Low-res tiles should not be enough.
|
| - EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -
|
| - // Initialize remaining tiles.
|
| - pending_layer_->SetAllTilesReady();
|
| -
|
| - EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -}
|
| -
|
| -TEST_F(PictureLayerImplTest, HighResReadyToDrawNotEnoughToActivate) {
|
| - gfx::Size tile_size(100, 100);
|
| - gfx::Size layer_bounds(1000, 1000);
|
| -
|
| - SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size);
|
| -
|
| - // Make sure some tiles are not shared.
|
| - pending_layer_->set_invalidation(gfx::Rect(gfx::Point(50, 50), tile_size));
|
| -
|
| - CreateHighLowResAndSetAllTilesVisible();
|
| - active_layer_->SetAllTilesReady();
|
| - pending_layer_->MarkVisibleResourcesAsRequired();
|
| -
|
| - // All pending layer tiles required are not ready.
|
| - EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -
|
| - // Initialize all high-res tiles.
|
| - pending_layer_->SetAllTilesReadyInTiling(pending_layer_->HighResTiling());
|
| -
|
| - // High-res tiles should not be enough.
|
| - EXPECT_FALSE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -
|
| - // Initialize remaining tiles.
|
| - pending_layer_->SetAllTilesReady();
|
| -
|
| - EXPECT_TRUE(pending_layer_->AllTilesRequiredForActivationAreReadyToDraw());
|
| -}
|
| -
|
| } // namespace
|
| } // namespace cc
|
|
|