Moving RenderSurface creation outside of CalcDrawProps

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 ca4306cb4212f1604733edd8fa2868e9928bb120..01a7eb057df2c3531841bd9cfd8e972bd852c72d 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -137,6 +137,7 @@ class PictureLayerImplTest : public testing::Test {
         FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile);
     pending_layer->SetDrawsContent(true);
     pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
+    pending_tree->root_layer()->SetHasRenderSurface(true);

[danakj, 2014/09/03 19:30:33]

nit: do this on pending_layer above the SetRootLayer call

[awoloszyn, 2014/09/09 15:31:36]

Done.

 
     pending_layer_ = static_cast<FakePictureLayerImpl*>(
         host_impl_.pending_tree()->LayerById(id_));
@@ -3452,7 +3453,7 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
 
   FakePictureLayerImpl* pending_mask_content = mask.get();
   layer_with_mask->SetMaskLayer(mask.PassAs<LayerImpl>());
-
+  layer_with_mask->SetHasRenderSurface(true);
   scoped_ptr<FakePictureLayerImpl> child_of_layer_with_mask =
       FakePictureLayerImpl::Create(host_impl_.pending_tree(), 4);
 
@@ -3463,7 +3464,7 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
   layer_with_mask->AddChild(child_of_layer_with_mask.PassAs<LayerImpl>());
 
   root->AddChild(layer_with_mask.PassAs<LayerImpl>());
-
+  root->SetHasRenderSurface(true);
   host_impl_.pending_tree()->SetRootLayer(root.Pass());
 
   EXPECT_FALSE(pending_mask_content->tilings());