cc: Main thread skip single layers instead of subtrees

cc/trees/layer_tree_host_common.cc

Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index fd636302fc6ae8ebfd21c4c7b5d988f0157f9324..fc0aeac0dc669244dcae04c6bd7d8c0b0b26f352 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -538,8 +538,9 @@ void CalculateRenderTarget(LayerImpl* layer,
 
   // 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;
   }
@@ -604,8 +605,9 @@ void CalculateRenderSurfaceLayerList(
 
   // 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;
@@ -928,7 +930,7 @@ void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
   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);