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 bd6a8f7f479f7fd466a466cfadcbf30597a07103..2c46ecdbcf39c9b377ca31e9ccc6cdd8480b0730 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -140,6 +140,7 @@ class PictureLayerImplTest : public testing::Test {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile);
     pending_layer->SetDrawsContent(true);
+    pending_layer->SetHasRenderSurface(true);
     pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
 
     pending_layer_ = static_cast<FakePictureLayerImpl*>(
@@ -3459,7 +3460,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);
 
@@ -3470,7 +3471,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());