cc : Stop pushing properties not used by LayerImpl to LayerImpl (3)

cc/trees/draw_property_utils.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/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 29 matching lines @@
   return layer->layer_tree_host()->LayerById(node->owner_id);
 }
 
 static LayerImpl* EffectNodeOwner(LayerImpl* layer) {
   EffectNode* node =
       layer->layer_tree_impl()->property_trees()->effect_tree.Node(
           layer->effect_tree_index());
   return layer->layer_tree_impl()->LayerById(node->owner_id);
 }
 
+static void inline ValidateIsNotRootForIsolatedGroup(Layer* layer) {
+  DCHECK(!layer->is_root_for_isolated_group()) << "layer: " << layer->id();
+}
+
+static void inline ValidateIsNotRootForIsolatedGroup(LayerImpl* layer) {}
+
 template <typename LayerType>
 static void ValidateRenderSurfaceForLayer(LayerType* layer) {
   // This test verifies that there are no cases where a LayerImpl needs
   // a render surface, but doesn't have one.
   if (layer->has_render_surface())
     return;
 
   DCHECK(layer->filters().IsEmpty()) << "layer: " << layer->id();
   DCHECK(layer->background_filters().IsEmpty()) << "layer: " << layer->id();
   DCHECK(!IsRootLayer(layer)) << "layer: " << layer->id();
   if (EffectNodeOwner(layer)->replica_layer() == layer)
     return;
   DCHECK(!layer->mask_layer()) << "layer: " << layer->id();
   DCHECK(!layer->replica_layer()) << "layer: " << layer->id();
-  DCHECK(!layer->is_root_for_isolated_group()) << "layer: " << layer->id();
   DCHECK(!layer->HasCopyRequest()) << "layer: " << layer->id();
+  ValidateIsNotRootForIsolatedGroup(layer);
 }
 
 static void ValidateRenderSurfacesRecursive(Layer* layer) {
   ValidateRenderSurfaceForLayer(layer);
   for (size_t i = 0; i < layer->children().size(); ++i)
     ValidateRenderSurfacesRecursive(layer->child_at(i));
 }
 #endif
 
 template <typename LayerType>
@@ skipping 1047 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc