cc: Remove EnsureRenderSurfaceLayerList, do UpdateDrawProps when needed.

cc/layers/picture_image_layer_impl_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/layers/picture_image_layer_impl.h"
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 48 matching lines @@
     }
     TestablePictureImageLayerImpl* layer =
         new TestablePictureImageLayerImpl(tree, id);
     layer->SetBounds(gfx::Size(100, 200));
     layer->tilings_.reset(new PictureLayerTilingSet(&tiling_client_,
                                                     layer->bounds()));
     layer->pile_ = tiling_client_.pile();
     return make_scoped_ptr(layer);
   }
 
-  void UpdateDrawProperties() {
-    host_impl_.pending_tree()->UpdateDrawProperties();
-  }
-
  protected:
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   TestSharedBitmapManager shared_bitmap_manager_;
   FakePictureLayerTilingClient tiling_client_;
 };
 
 TEST_F(PictureImageLayerImplTest, CalculateContentsScale) {
   scoped_ptr<TestablePictureImageLayerImpl> layer(CreateLayer(1, PENDING_TREE));
   layer->SetDrawsContent(true);
 
   float contents_scale_x;
   float contents_scale_y;
   gfx::Size content_bounds;
   layer->CalculateContentsScale(2.f,
                                 3.f,
                                 4.f,
                                 1.f,
                                 false,
                                 &contents_scale_x,
                                 &contents_scale_y,
                                 &content_bounds);
   EXPECT_FLOAT_EQ(1.f, contents_scale_x);
   EXPECT_FLOAT_EQ(1.f, contents_scale_y);
   EXPECT_EQ(layer->bounds(), content_bounds);
 }
 
-TEST_F(PictureImageLayerImplTest, AreVisibleResourcesReady) {
-  scoped_ptr<TestablePictureImageLayerImpl> layer(CreateLayer(1, PENDING_TREE));
-  layer->SetBounds(gfx::Size(100, 200));
-  layer->SetDrawsContent(true);
-
-  UpdateDrawProperties();

[danakj, 2014/06/11 21:41:19]

I did some related/unrelated blaming just now and came across this unit test.
This line was added to it in a283d31f511 where we added some DCHECKs in
PictureLayerImpl::AreVisibleResourcesReady. Since that method is gone now, this
test isn't verifying much, but that's unfortunate because I think it leaves that
CL without any kind of regression test right now.

-
-  float contents_scale_x;
-  float contents_scale_y;
-  gfx::Size content_bounds;
-  layer->CalculateContentsScale(2.f,
-                                3.f,
-                                4.f,
-                                1.f,
-                                false,
-                                &contents_scale_x,
-                                &contents_scale_y,
-                                &content_bounds);
-  layer->UpdateTilePriorities();
-
-  EXPECT_TRUE(layer->AreVisibleResourcesReady());
-}
-
 TEST_F(PictureImageLayerImplTest, IgnoreIdealContentScale) {
   scoped_ptr<TestablePictureImageLayerImpl> pending_layer(
       CreateLayer(1, PENDING_TREE));
   pending_layer->SetDrawsContent(true);
 
   // Set PictureLayerImpl::ideal_contents_scale_ to 2.f which is not equal
   // to the content scale used by PictureImageLayerImpl.
   const float suggested_ideal_contents_scale = 2.f;
   const float device_scale_factor = 3.f;
   const float page_scale_factor = 4.f;
@@ skipping 40 matching lines @@
   active_layer->DidDraw(NULL);
 
   EXPECT_EQ(DrawQuad::TILED_CONTENT, quad_culler.quad_list()[0]->material);
 
   // Tiles are ready at correct scale, so should not set had_incomplete_tile.
   EXPECT_FALSE(data.had_incomplete_tile);
 }
 
 }  // namespace
 }  // namespace cc