cc: Remove support for disabling non-root render surfaces.

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 382 matching lines @@
     // to continue to propagate.
     layers_are_clipped = apply_ancestor_clip;
   }
 
   bool layer_clips_subtree = LayerClipsSubtree(layer);
   if (layer_clips_subtree) {
     layers_are_clipped = true;
     data_for_children->apply_ancestor_clip = true;
   }
 
-  // Without surfaces, all non-viewport clips have to be applied using layer
-  // clipping.
-  bool layers_are_clipped_when_surfaces_disabled =
-      layer_clips_subtree || parent->layers_are_clipped_when_surfaces_disabled;
-
   // Render surface's clip is needed during hit testing. So, we need to create
   // a clip node for every render surface.
   bool requires_node = layer_clips_subtree || created_render_surface;
 
   if (!requires_node) {
     data_for_children->clip_tree_parent = parent_id;
     DCHECK_EQ(layers_are_clipped, parent->layers_are_clipped);
-    DCHECK_EQ(layers_are_clipped_when_surfaces_disabled,
-              parent->layers_are_clipped_when_surfaces_disabled);
   } else {
     LayerType* transform_parent = data_for_children->transform_tree_parent;
     if (PositionConstraint(layer).is_fixed_position() &&
         !created_transform_node) {
       transform_parent = data_for_children->transform_fixed_parent;
     }
     ClipNode node;
     node.clip = gfx::RectF(gfx::PointF() + layer->offset_to_transform_parent(),
                            gfx::SizeF(layer->bounds()));
     node.transform_id = transform_parent->transform_tree_index();
@@ skipping 19 matching lines @@
       node.clip_type = ClipNode::ClipType::APPLIES_LOCAL_CLIP;
     } else if (Filters(layer).HasFilterThatMovesPixels()) {
       node.clip_type = ClipNode::ClipType::EXPANDS_CLIP;
       node.clip_expander =
           base::MakeUnique<ClipExpander>(layer->effect_tree_index());
     } else {
       node.clip_type = ClipNode::ClipType::NONE;
     }
     node.resets_clip = has_unclipped_surface;
     node.layers_are_clipped = layers_are_clipped;
-    node.layers_are_clipped_when_surfaces_disabled =
-        layers_are_clipped_when_surfaces_disabled;
 
     data_for_children->clip_tree_parent =
         data_for_children->property_trees->clip_tree.Insert(node, parent_id);
     data_for_children->property_trees
         ->layer_id_to_clip_node_index[layer->id()] =
         data_for_children->clip_tree_parent;
   }
 
   layer->SetClipTreeIndex(data_for_children->clip_tree_parent);
 }
@@ skipping 1075 matching lines @@
     color = SkColorSetA(color, 255);
   BuildPropertyTreesTopLevelInternal(
       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->ResetCachedData();
 }
 
 }  // namespace cc