Makes tile-creation lazy

cc/layers/picture_layer_impl_unittest.cc

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 4f00ed778be63cc9761843f6268adfa5e46b955d..9c0f5ab5e20eeed65ea0aa855c96b2aebae51df5 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -32,14 +32,6 @@ class TestablePictureLayerImpl : public PictureLayerImpl {
   PictureLayerTilingSet& tilings() { return *tilings_; }
   Region& invalidation() { return invalidation_; }
 
-  virtual gfx::Size CalculateTileSize(
-      gfx::Size current_tile_size,
-      gfx::Size content_bounds) OVERRIDE {
-    if (current_tile_size.IsEmpty())
-      return gfx::Size(100, 100);
-    return current_tile_size;
-  }
-
   using PictureLayerImpl::AddTiling;
   using PictureLayerImpl::CleanUpTilingsOnActiveLayer;
 
@@ -169,8 +161,12 @@ class PictureLayerImplTest : public testing::Test {
     active_layer_->AddTiling(2.3f);
     active_layer_->AddTiling(1.0f);
     active_layer_->AddTiling(0.5f);
+    for (size_t i = 0; i < active_layer_->tilings().num_tilings(); ++i)
+      active_layer_->tilings().tiling_at(i)->CreateAllTilesForTesting();
     pending_layer_->invalidation() = invalidation;
     pending_layer_->SyncFromActiveLayer();
+    for (size_t i = 0; i < pending_layer_->tilings().num_tilings(); ++i)
+      pending_layer_->tilings().tiling_at(i)->CreateAllTilesForTesting();
   }
 
   void SetupPendingTree(
@@ -231,6 +227,7 @@ class PictureLayerImplTest : public testing::Test {
         1.f, false, &result_scale_x, &result_scale_y, &result_bounds);
 
     // Add 1x1 rects at the centers of each tile, then re-record pile contents
+    active_layer_->tilings().tiling_at(0)->CreateAllTilesForTesting();
     std::vector<Tile*> tiles =
         active_layer_->tilings().tiling_at(0)->AllTilesForTesting();
     EXPECT_EQ(16u, tiles.size());
@@ -401,8 +398,13 @@ TEST_F(PictureLayerImplTest, NoInvalidationBoundsChange) {
          ++iter) {
       EXPECT_TRUE(*iter);
       EXPECT_FALSE(iter.geometry_rect().IsEmpty());
+      std::vector<Tile*> active_tiles =
+          active_layer_->tilings().tiling_at(i)->AllTilesForTesting();
+      std::vector<Tile*> pending_tiles = tiling->AllTilesForTesting();
       if (iter.geometry_rect().right() >= active_content_bounds.width() ||
-          iter.geometry_rect().bottom() >= active_content_bounds.height()) {
+          iter.geometry_rect().bottom() >= active_content_bounds.height() ||
+          active_tiles[0]->content_rect().size() !=
+              pending_tiles[0]->content_rect().size()) {
         EXPECT_EQ(pending_pile, iter->picture_pile());
       } else {
         EXPECT_EQ(active_pile, iter->picture_pile());