cc: Mark layers with invalid property tree indices as non-drawable.

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 <stddef.h>
 
 #include <algorithm>
 
@@ skipping 349 matching lines @@
   // The root surface always gets added to the render surface  list.
   AddSurfaceToRenderSurfaceList(root_surface, render_surface_list,
                                 property_trees);
   // For all non-skipped layers, add their target to the render surface list if
   // it's not already been added, and add their content rect to the target
   // surface's accumulated content rect.
   for (LayerImpl* layer : *layer_tree_impl) {
     DCHECK(layer);
     // TODO(crbug.com/726423): LayerImpls should never have invalid PropertyTree
     // indices.
-    if (!layer || !layer->HasValidPropertyTreeIndices())
+    if (!layer)
       continue;
+    layer->set_contributes_to_drawn_render_surface(false);
+    layer->set_raster_even_if_not_drawn(false);
 
-    layer->set_contributes_to_drawn_render_surface(false);
+    if (!layer->HasValidPropertyTreeIndices())
+      continue;
 
     bool is_root = layer_tree_impl->IsRootLayer(layer);
 
     bool skip_draw_properties_computation =
         draw_property_utils::LayerShouldBeSkippedForDrawPropertiesComputation(
             layer, property_trees->transform_tree, property_trees->effect_tree);
 
     bool skip_for_invertibility = SkipForInvertibility(layer, property_trees);
 
     bool skip_layer = !is_root && (skip_draw_properties_computation ||
@@ skipping 292 matching lines @@
 
 PropertyTrees* GetPropertyTrees(Layer* layer) {
   return layer->layer_tree_host()->property_trees();
 }
 
 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
   return layer->layer_tree_impl()->property_trees();
 }
 
 }  // namespace cc