cc : Simplify layer skipping logic

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 559 matching lines @@
   // |render_surface_layer_list| is the top level RenderSurfaceLayerList.
 
   // |descendants| is used to determine what's in current layer's render
   // surface's layer list.
 
   // |subtree_visible_from_ancestor| is set during recursion to affect current
   // layer's subtree.
 
   // |can_render_to_separate_surface| and |current_render_surface_layer_list_id|
   // are settings that should stay the same during recursion.
-  bool layer_is_drawn = false;
   DCHECK_GE(layer->effect_tree_index(), 0);
-  layer_is_drawn = property_trees->effect_tree.Node(layer->effect_tree_index())
-                       ->data.is_drawn;
+  bool layer_is_drawn =
+      property_trees->is_active
+          ? property_trees->effect_tree.Node(layer->effect_tree_index())
+                ->data.is_drawn_on_active
+          : property_trees->effect_tree.Node(layer->effect_tree_index())
+                ->data.is_drawn_on_main_and_pending;
 
   // The root layer cannot be skipped.
   if (!IsRootLayer(layer) &&
-      draw_property_utils::LayerShouldBeSkipped(layer, layer_is_drawn,
-                                                property_trees->transform_tree,
-                                                property_trees->effect_tree)) {
+      draw_property_utils::LayerShouldBeSkipped(
+          layer, property_trees->transform_tree, property_trees->effect_tree)) {
     if (layer->render_surface())
       layer->ClearRenderSurfaceLayerList();
     for (auto* child_layer : layer->children()) {
       CalculateRenderSurfaceLayerList(
           child_layer, property_trees, render_surface_layer_list, descendants,
           nearest_occlusion_immune_ancestor, layer_is_drawn,
           can_render_to_separate_surface, current_render_surface_layer_list_id,
           max_texture_size);
 
       MarkMasksAndAddChildToDescendantsIfRequired(
@@ skipping 42 matching lines @@
     layer->ClearRenderSurfaceLayerList();
 
     render_surface_layer_list->push_back(layer);
 
     descendants = &(layer->render_surface()->layer_list());
   }
 
   size_t descendants_size = descendants->size();
 
   bool layer_should_be_skipped = !draw_property_utils::LayerNeedsUpdate(
-      layer, layer_is_drawn, property_trees->transform_tree);
+      layer, property_trees->transform_tree);
   if (!layer_should_be_skipped) {
     MarkLayerWithRenderSurfaceLayerListId(layer,
                                           current_render_surface_layer_list_id);
     descendants->push_back(layer);
   }
 
 
   // Clear the old accumulated content rect of surface.
   if (render_to_separate_surface)
     layer->render_surface()->ClearAccumulatedContentRect();
@@ skipping 288 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