Update from https://crrev.com/308996

cc/resources/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/eviction_tile_priority_queue.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 103 matching lines @@
       pending_layer =
           FakePictureLayerImpl::CreateWithRasterSource(pending_tree, id_, pile);
       pending_layer->SetDrawsContent(true);
     }
     // The bounds() just mirror the pile size.
     pending_layer->SetBounds(pending_layer->raster_source()->GetSize());
     pending_tree->SetRootLayer(pending_layer.Pass());
 
     pending_layer_ = static_cast<FakePictureLayerImpl*>(
         host_impl_.pending_tree()->LayerById(id_));
-    pending_layer_->DoPostCommitInitializationIfNeeded();
   }
 
   TileManager* tile_manager() { return host_impl_.tile_manager(); }
 
  protected:
   GlobalStateThatImpactsTilePriority global_state_;
 
   TestSharedBitmapManager shared_bitmap_manager_;
   TileMemoryLimitPolicy memory_limit_policy_;
   int max_tiles_;
@@ skipping 202 matching lines @@
       FakePicturePileImpl::CreateFilledPile(tile_size, gfx::Size(1000, 1000));
   scoped_ptr<FakePictureLayerImpl> pending_child =
       FakePictureLayerImpl::CreateWithRasterSource(host_impl_.pending_tree(),
                                                    id_ + 1, pending_pile);
   pending_layer_->AddChild(pending_child.Pass());
   FakePictureLayerImpl* pending_child_raw = static_cast<FakePictureLayerImpl*>(
       host_impl_.pending_tree()->LayerById(id_ + 1));
   ASSERT_TRUE(pending_child_raw);
 
   pending_child_raw->SetDrawsContent(true);
-  pending_child_raw->DoPostCommitInitializationIfNeeded();
   pending_child_raw->CreateDefaultTilingsAndTiles();
   ASSERT_TRUE(pending_child_raw->HighResTiling());
 
   // Set a small viewport, so we have soon and eventually tiles.
   gfx::Rect viewport(200, 200);
   active_layer_->draw_properties().visible_content_rect = viewport;
   active_layer_->UpdateTiles(Occlusion(), false);
   pending_layer_->draw_properties().visible_content_rect = viewport;
   pending_layer_->UpdateTiles(Occlusion(), false);
   pending_child_raw->draw_properties().visible_content_rect = viewport;
@@ skipping 216 matching lines @@
   pending_layer_->CreateDefaultTilingsAndTiles();
 
   scoped_ptr<FakePictureLayerImpl> pending_child =
       FakePictureLayerImpl::CreateWithRasterSource(host_impl_.pending_tree(), 2,
                                                    pending_pile);
   pending_layer_->AddChild(pending_child.Pass());
 
   FakePictureLayerImpl* pending_child_layer =
       static_cast<FakePictureLayerImpl*>(pending_layer_->children()[0]);
   pending_child_layer->SetDrawsContent(true);
-  pending_child_layer->DoPostCommitInitializationIfNeeded();
   pending_child_layer->CreateDefaultTilingsAndTiles();
 
   std::set<Tile*> all_tiles;
   size_t tile_count = 0;
   RasterTilePriorityQueue raster_queue;
   host_impl_.BuildRasterQueue(&raster_queue, SAME_PRIORITY_FOR_BOTH_TREES);
   while (!raster_queue.IsEmpty()) {
     ++tile_count;
     EXPECT_TRUE(raster_queue.Top());
     all_tiles.insert(raster_queue.Top());
@@ skipping 98 matching lines @@
   pending_layer_->AddChild(pending_child.Pass());
 
   // Create a fully transparent child layer so that its tile priorities are not
   // considered to be valid.
   FakePictureLayerImpl* pending_child_layer =
       static_cast<FakePictureLayerImpl*>(pending_layer_->children()[0]);
   pending_child_layer->SetDrawsContent(true);
   pending_child_layer->CreateDefaultTilingsAndTiles();
   pending_child_layer->SetOpacity(0.0);
   pending_child_layer->layer_tree_impl()->UpdateDrawProperties();
-  pending_child_layer->DoPostCommitInitializationIfNeeded();
 
   // Renew all of the tile priorities.
   gfx::Rect viewport(layer_bounds);
   pending_layer_->HighResTiling()->ComputeTilePriorityRects(viewport, 1.0f, 1.0,
                                                             Occlusion());
   pending_layer_->LowResTiling()->ComputeTilePriorityRects(viewport, 1.0f, 1.0,
                                                            Occlusion());
   pending_child_layer->HighResTiling()->ComputeTilePriorityRects(
       viewport, 1.0f, 1.0, Occlusion());
   pending_child_layer->LowResTiling()->ComputeTilePriorityRects(
@@ skipping 83 matching lines @@
   }
 
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 
   queue.Reset();
   for (int i = 1; i < 10; ++i) {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::Create(host_impl_.pending_tree(), id_ + i);
     pending_layer->SetDrawsContent(true);
-    pending_layer->DoPostCommitInitializationIfNeeded();
     pending_layer->set_has_valid_tile_priorities(true);
     pending_layer_->AddChild(pending_layer.Pass());
   }
 
   host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
   EXPECT_FALSE(queue.IsEmpty());
 
   tile_count = 0;
   all_tiles.clear();
   while (!queue.IsEmpty()) {
@@ skipping 30 matching lines @@
   EXPECT_EQ(16u, tile_count);
 
   std::vector<Tile*> tiles(all_tiles.begin(), all_tiles.end());
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
 
   EvictionTilePriorityQueue queue;
   for (int i = 1; i < 10; ++i) {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::Create(host_impl_.pending_tree(), id_ + i);
     pending_layer->SetDrawsContent(true);
-    pending_layer->DoPostCommitInitializationIfNeeded();
     pending_layer->set_has_valid_tile_priorities(true);
     pending_layer_->AddChild(pending_layer.Pass());
   }
 
   host_impl_.BuildEvictionQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
   EXPECT_FALSE(queue.IsEmpty());
 
   tile_count = 0;
   all_tiles.clear();
   while (!queue.IsEmpty()) {
     EXPECT_TRUE(queue.Top());
     all_tiles.insert(queue.Top());
     ++tile_count;
     queue.Pop();
   }
   EXPECT_EQ(tile_count, all_tiles.size());
   EXPECT_EQ(16u, tile_count);
 }
 
 }  // namespace
 }  // namespace cc