Force use of and cache render surface.

cc/trees/property_tree_builder.cc

 // Copyright 2014 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/trees/property_tree_builder.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 586 matching lines @@
 
 static inline bool DoubleSided(Layer* layer) {
   return layer->double_sided();
 }
 
 static inline bool DoubleSided(LayerImpl* layer) {
   return layer->test_properties()->double_sided;
 }
 
 static inline bool ForceRenderSurface(Layer* layer) {
-  return layer->force_render_surface_for_testing();
+  return layer->force_render_surface();
 }
 
 static inline bool ForceRenderSurface(LayerImpl* layer) {
   return layer->test_properties()->force_render_surface;
 }
 
 template <typename LayerType>
 static inline bool LayerIsInExisting3DRenderingContext(LayerType* layer) {
   return Is3dSorted(layer) && Parent(layer) && Is3dSorted(Parent(layer)) &&
          (SortingContextId(Parent(layer)) == SortingContextId(layer));
@@ skipping 290 matching lines @@
 
   EffectTree& effect_tree = data_for_children->property_trees->effect_tree;
   int node_id = effect_tree.Insert(EffectNode(), parent_id);
   EffectNode* node = effect_tree.back();
 
   node->owning_layer_id = layer->id();
   node->opacity = Opacity(layer);
   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);
   node->filters_origin = FiltersOrigin(layer);
   node->has_potential_opacity_animation = has_potential_opacity_animation;
   node->has_potential_filter_animation = has_potential_filter_animation;
   node->double_sided = DoubleSided(layer);
   node->subtree_hidden = HideLayerAndSubtree(layer);
   node->is_currently_animating_opacity = OpacityIsAnimating(layer);
   node->is_currently_animating_filter = FilterIsAnimating(layer);
@@ skipping 460 matching lines @@
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
       device_transform, property_trees, color);
   property_trees->effect_tree.CreateOrReuseRenderSurfaces(
       &render_surfaces, root_layer->layer_tree_impl());
   property_trees->ResetCachedData();
 }
 
 }  // namespace cc