Move tile-free-software render surface disabling to UpdateDrawProperties.

cc/trees/layer_tree_host_common.cc

 // Copyright 2011 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/layer_tree_host_common.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 1073 matching lines @@
 }
 
 template <typename LayerType>
 struct SubtreeGlobals {
   LayerSorter* layer_sorter;
   int max_texture_size;
   float device_scale_factor;
   float page_scale_factor;
   LayerType* page_scale_application_layer;
   bool can_adjust_raster_scales;
+  bool can_render_to_separate_surface;
 };
 
 template<typename LayerType, typename RenderSurfaceType>
 struct DataForRecursion {
   // The accumulated sequence of transforms a layer will use to determine its
   // own draw transform.
   gfx::Transform parent_matrix;
 
   // The accumulated sequence of transforms a layer will use to determine its
   // own screen-space transform.
@@ skipping 340 matching lines @@
       data_from_ancestor.full_hierarchy_matrix;
 
   // If the subtree will scale layer contents by the transform hierarchy, then
   // we should scale things into the render surface by the transform hierarchy
   // to take advantage of that.
   gfx::Vector2dF render_surface_sublayer_scale =
       globals.can_adjust_raster_scales
       ? combined_transform_scales
       : gfx::Vector2dF(layer_scale_factors, layer_scale_factors);
 
-  if (SubtreeShouldRenderToSeparateSurface(
-          layer, combined_transform.Preserves2dAxisAlignment())) {
+  bool render_to_separate_surface = false;
+  if (globals.can_render_to_separate_surface)

[danakj, 2013/09/24 14:47:04]

{}

+    render_to_separate_surface = SubtreeShouldRenderToSeparateSurface(
+          layer, combined_transform.Preserves2dAxisAlignment());
+  else
+    render_to_separate_surface = IsRootLayer(layer);
+  if (render_to_separate_surface) {
     // Check back-face visibility before continuing with this surface and its
     // subtree
     if (!layer->double_sided() && TransformToParentIsKnown(layer) &&
         IsSurfaceBackFaceVisible(layer, combined_transform)) {
       layer->ClearRenderSurface();
       return;
     }
 
     RenderSurfaceType* render_surface = CreateOrReuseRenderSurface(layer);
 
@@ skipping 468 matching lines @@
   // The root layer's render_surface should receive the device viewport as the
   // initial clip rect.
   gfx::Rect device_viewport_rect(inputs->device_viewport_size);
 
   SubtreeGlobals<Layer> globals;
   globals.layer_sorter = NULL;
   globals.max_texture_size = inputs->max_texture_size;
   globals.device_scale_factor = inputs->device_scale_factor;
   globals.page_scale_factor = inputs->page_scale_factor;
   globals.page_scale_application_layer = inputs->page_scale_application_layer;
+  globals.can_render_to_separate_surface =
+      inputs->can_render_to_separate_surface;
   globals.can_adjust_raster_scales = inputs->can_adjust_raster_scales;
 
   DataForRecursion<Layer, RenderSurface> data_for_recursion;
   data_for_recursion.parent_matrix = scaled_device_transform;
   data_for_recursion.full_hierarchy_matrix = identity_matrix;
   data_for_recursion.scroll_compensation_matrix = identity_matrix;
   data_for_recursion.fixed_container = inputs->root_layer;
   data_for_recursion.clip_rect_in_target_space = device_viewport_rect;
   data_for_recursion.clip_rect_of_target_surface_in_target_space =
       device_viewport_rect;
@@ skipping 37 matching lines @@
   // The root layer's render_surface should receive the device viewport as the
   // initial clip rect.
   gfx::Rect device_viewport_rect(inputs->device_viewport_size);
 
   SubtreeGlobals<LayerImpl> globals;
   globals.layer_sorter = &layer_sorter;
   globals.max_texture_size = inputs->max_texture_size;
   globals.device_scale_factor = inputs->device_scale_factor;
   globals.page_scale_factor = inputs->page_scale_factor;
   globals.page_scale_application_layer = inputs->page_scale_application_layer;
+  globals.can_render_to_separate_surface =
+      inputs->can_render_to_separate_surface;
   globals.can_adjust_raster_scales = inputs->can_adjust_raster_scales;
 
   DataForRecursion<LayerImpl, RenderSurfaceImpl> data_for_recursion;
   data_for_recursion.parent_matrix = scaled_device_transform;
   data_for_recursion.full_hierarchy_matrix = identity_matrix;
   data_for_recursion.scroll_compensation_matrix = identity_matrix;
   data_for_recursion.fixed_container = inputs->root_layer;
   data_for_recursion.clip_rect_in_target_space = device_viewport_rect;
   data_for_recursion.clip_rect_of_target_surface_in_target_space =
       device_viewport_rect;
@@ skipping 207 matching lines @@
   // At this point, we think the point does hit the touch event handler region
   // on the layer, but we need to walk up the parents to ensure that the layer
   // was not clipped in such a way that the hit point actually should not hit
   // the layer.
   if (PointIsClippedBySurfaceOrClipRect(screen_space_point, layer_impl))
     return false;
 
   return true;
 }
 }  // namespace cc