cc: Main thread skip single layers instead of subtrees

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 520 matching lines @@
                            PropertyTrees* property_trees,
                            bool subtree_visible_from_ancestor,
                            bool can_render_to_separate_surface) {
   bool layer_is_drawn;
   DCHECK_GE(layer->effect_tree_index(), 0);
   layer_is_drawn = property_trees->effect_tree.Node(layer->effect_tree_index())
                        ->data.is_drawn;
 
   // The root layer cannot be skipped.
   if (!IsRootLayer(layer) &&
-      draw_property_utils::LayerShouldBeSkipped(
-          layer, layer_is_drawn, property_trees->transform_tree)) {
+      draw_property_utils::LayerShouldBeSkipped(layer, layer_is_drawn,
+                                                property_trees->transform_tree,
+                                                property_trees->effect_tree)) {
     layer->draw_properties().render_target = nullptr;
     return;
   }
 
   bool render_to_separate_surface =
       IsRootLayer(layer) ||
       (can_render_to_separate_surface && layer->render_surface());
 
   if (render_to_separate_surface) {
     DCHECK(layer->render_surface()) << IsRootLayer(layer)
@@ skipping 44 matching lines @@
 
   // |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;
 
   // The root layer cannot be skipped.
   if (!IsRootLayer(layer) &&
-      draw_property_utils::LayerShouldBeSkipped(
-          layer, layer_is_drawn, property_trees->transform_tree)) {
+      draw_property_utils::LayerShouldBeSkipped(layer, layer_is_drawn,
+                                                property_trees->transform_tree,
+                                                property_trees->effect_tree)) {
     if (layer->render_surface())
       layer->ClearRenderSurfaceLayerList();
     layer->draw_properties().render_target = nullptr;
     return;
   }
 
   bool render_to_separate_surface =
       IsRootLayer(layer) ||
       (can_render_to_separate_surface && layer->render_surface());
 
@@ skipping 302 matching lines @@
       inputs->root_layer, inputs->page_scale_layer,
       inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer,
       overscroll_elasticity_layer, elastic_overscroll,
       inputs->page_scale_factor, inputs->device_scale_factor,
       gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
       property_trees);
   draw_property_utils::UpdateRenderSurfaces(inputs->root_layer, property_trees);
   draw_property_utils::UpdatePropertyTrees(property_trees,
                                            can_render_to_separate_surface);
   draw_property_utils::FindLayersThatNeedUpdates(
-      inputs->root_layer, property_trees->transform_tree,
+      inputs->root_layer->layer_tree_host(), property_trees->transform_tree,
       property_trees->effect_tree, &update_layer_list);
   draw_property_utils::ComputeVisibleRectsForTesting(
       property_trees, can_render_to_separate_surface, &update_layer_list);
 }
 
 void LayerTreeHostCommon::CalculateDrawProperties(
     CalcDrawPropsImplInputs* inputs) {
   CalculateDrawPropertiesInternal(inputs, DONT_BUILD_PROPERTY_TREES);
 
   if (CdpPerfTracingEnabled()) {
@@ skipping 51 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