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 a75feb0c0bdeac8e72bcf16f55ff782156e2fd9b..aecbbdb6014c9d2103a267bb92931c1b39300dc4 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -152,6 +152,7 @@ class PictureLayerImplTest : public testing::Test {
       pending_layer = FakePictureLayerImpl::CreateWithRasterSource(
           pending_tree, id_, raster_source);
       pending_layer->SetDrawsContent(true);
+      pending_layer->SetHasRenderSurface(true);
     }
     // The bounds() just mirror the pile size.
     pending_layer->SetBounds(pending_layer->raster_source()->GetSize());
@@ -3727,6 +3728,7 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
 
   FakePictureLayerImpl* pending_mask_content = mask.get();
   layer_with_mask->SetMaskLayer(mask.Pass());
+  layer_with_mask->SetHasRenderSurface(true);
 
   scoped_ptr<FakePictureLayerImpl> child_of_layer_with_mask =
       FakePictureLayerImpl::Create(host_impl_.pending_tree(), 4);
@@ -3738,6 +3740,7 @@ TEST_F(PictureLayerImplTest, UpdateTilesForMasksWithNoVisibleContent) {
   layer_with_mask->AddChild(child_of_layer_with_mask.Pass());
 
   root->AddChild(layer_with_mask.Pass());
+  root->SetHasRenderSurface(true);
 
   host_impl_.pending_tree()->SetRootLayer(root.Pass());