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 15ade9b1b638a1c2c225a16c0ce3c01755a93279..d0cb1cb14864ae2a826c39c65f530c11c66c4392 100644 |
--- a/cc/layers/picture_layer_impl_unittest.cc |
+++ b/cc/layers/picture_layer_impl_unittest.cc |
@@ -120,8 +120,7 @@ class PictureLayerImplTest : public testing::Test { |
pending_layer_->tilings()->tiling_at(i)->CreateAllTilesForTesting(); |
} |
- void SetupPendingTree( |
- scoped_refptr<PicturePileImpl> pile) { |
+ void SetupPendingTree(scoped_refptr<PicturePileImpl> pile) { |
host_impl_.CreatePendingTree(); |
LayerTreeImpl* pending_tree = host_impl_.pending_tree(); |
// Clear recycled tree. |
@@ -140,8 +139,8 @@ class PictureLayerImplTest : public testing::Test { |
static void VerifyAllTilesExistAndHavePile( |
const PictureLayerTiling* tiling, |
PicturePileImpl* pile) { |
- for (PictureLayerTiling::CoverageIterator |
- iter(tiling, tiling->contents_scale(), tiling->ContentRect()); |
+ for (PictureLayerTiling::CoverageIterator iter( |
+ tiling, tiling->contents_scale(), tiling->TilingRect()); |
iter; |
++iter) { |
EXPECT_TRUE(*iter); |
@@ -455,10 +454,8 @@ TEST_F(PictureLayerImplTest, ClonePartialInvalidation) { |
gfx::Rect content_invalidation = gfx::ScaleToEnclosingRect( |
layer_invalidation, |
tiling->contents_scale()); |
- for (PictureLayerTiling::CoverageIterator |
- iter(tiling, |
- tiling->contents_scale(), |
- tiling->ContentRect()); |
+ for (PictureLayerTiling::CoverageIterator iter( |
+ tiling, tiling->contents_scale(), tiling->TilingRect()); |
iter; |
++iter) { |
EXPECT_TRUE(*iter); |
@@ -518,10 +515,8 @@ TEST_F(PictureLayerImplTest, NoInvalidationBoundsChange) { |
gfx::Rect active_content_bounds = gfx::ScaleToEnclosingRect( |
gfx::Rect(active_layer_bounds), |
tiling->contents_scale()); |
- for (PictureLayerTiling::CoverageIterator |
- iter(tiling, |
- tiling->contents_scale(), |
- tiling->ContentRect()); |
+ for (PictureLayerTiling::CoverageIterator iter( |
+ tiling, tiling->contents_scale(), tiling->TilingRect()); |
iter; |
++iter) { |
EXPECT_TRUE(*iter); |
@@ -574,10 +569,8 @@ TEST_F(PictureLayerImplTest, AddTilesFromNewRecording) { |
for (size_t i = 0; i < tilings->num_tilings(); ++i) { |
const PictureLayerTiling* tiling = tilings->tiling_at(i); |
- for (PictureLayerTiling::CoverageIterator |
- iter(tiling, |
- tiling->contents_scale(), |
- tiling->ContentRect()); |
+ for (PictureLayerTiling::CoverageIterator iter( |
+ tiling, tiling->contents_scale(), tiling->TilingRect()); |
iter; |
++iter) { |
EXPECT_FALSE(iter.full_tile_geometry_rect().IsEmpty()); |