Force use of and cache render surface.

cc/trees/property_tree_builder.cc

Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index a7efa0a71556ec6e68c77605d7e907fe504f32b3..610553e653e445cb6fec0fc31a65152838c3394e 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -604,7 +604,7 @@ static inline bool DoubleSided(LayerImpl* layer) {
 }
 
 static inline bool ForceRenderSurface(Layer* layer) {
-  return layer->force_render_surface_for_testing();
+  return layer->force_render_surface();
 }
 
 static inline bool ForceRenderSurface(LayerImpl* layer) {
@@ -915,6 +915,7 @@ bool AddEffectNodeIfNeeded(
   node->blend_mode = BlendMode(layer);
   node->unscaled_mask_target_size = layer->bounds();
   node->has_render_surface = should_create_render_surface;
+  node->force_render_surface = ForceRenderSurface(layer);
   node->has_copy_request = HasCopyRequest(layer);
   node->filters = Filters(layer);
   node->background_filters = BackgroundFilters(layer);