1 files changed, 5 insertions, 35 deletions
diff --git a/chromium/cc/trees/draw_property_utils.h b/chromium/cc/trees/draw_property_utils.h
index 54c7a458d33..2f286c2550d 100644
--- a/chromium/cc/trees/draw_property_utils.h
+++ b/chromium/cc/trees/draw_property_utils.h
@@ -10,7 +10,6 @@
 
 namespace gfx {
 class Transform;
-class Vector2dF;
 }  // namespace gfx
 
 namespace cc {
@@ -19,13 +18,11 @@ class Layer;
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeImpl;
-class RenderSurfaceImpl;
 class EffectTree;
 class TransformTree;
 class PropertyTrees;
 struct EffectNode;
 struct TransformNode;
-struct ElementId;
 
 namespace draw_property_utils {
 
@@ -39,52 +36,25 @@ void CC_EXPORT ComputeTransforms(TransformTree* transform_tree);
 // Computes screen space opacity for every node in the opacity tree.
 void CC_EXPORT ComputeEffects(EffectTree* effect_tree);
 
-void CC_EXPORT UpdatePropertyTrees(LayerTreeHost* layer_tree_host,
-                                   PropertyTrees* property_trees);
+void CC_EXPORT UpdatePropertyTrees(LayerTreeHost* layer_tree_host);
 
 void CC_EXPORT
 UpdatePropertyTreesAndRenderSurfaces(LayerImpl* root_layer,
                                      PropertyTrees* property_trees);
 
 void CC_EXPORT FindLayersThatNeedUpdates(LayerTreeHost* layer_tree_host,
-                                         const PropertyTrees* property_trees,
                                          LayerList* update_layer_list);
 
 void CC_EXPORT
 FindLayersThatNeedUpdates(LayerTreeImpl* layer_tree_impl,
-                          const PropertyTrees* property_trees,
                           std::vector<LayerImpl*>* visible_layer_list);
 
-void CC_EXPORT
-ComputeDrawPropertiesOfVisibleLayers(const LayerImplList* layer_list,
-                                     PropertyTrees* property_trees);
-
-void CC_EXPORT ComputeMaskDrawProperties(LayerImpl* mask_layer,
-                                         PropertyTrees* property_trees);
-
-void CC_EXPORT ComputeSurfaceDrawProperties(PropertyTrees* property_trees,
-                                            RenderSurfaceImpl* render_surface);
-
-bool CC_EXPORT LayerShouldBeSkippedForDrawPropertiesComputation(
-    LayerImpl* layer,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree);
-
-bool CC_EXPORT LayerNeedsUpdate(Layer* layer,
-                                bool layer_is_drawn,
-                                const PropertyTrees* property_trees);
-
-bool CC_EXPORT LayerNeedsUpdate(LayerImpl* layer,
-                                bool layer_is_drawn,
-                                const PropertyTrees* property_trees);
-
 gfx::Transform CC_EXPORT DrawTransform(const LayerImpl* layer,
                                        const TransformTree& transform_tree,
                                        const EffectTree& effect_tree);
 
 gfx::Transform CC_EXPORT ScreenSpaceTransform(const Layer* layer,
                                               const TransformTree& tree);
-
 gfx::Transform CC_EXPORT ScreenSpaceTransform(const LayerImpl* layer,
                                               const TransformTree& tree);
 
@@ -92,10 +62,10 @@ void CC_EXPORT UpdatePageScaleFactor(PropertyTrees* property_trees,
                                      TransformNode* page_scale_node,
                                      float page_scale_factor);
 
-void CC_EXPORT
-UpdateElasticOverscroll(PropertyTrees* property_trees,
-                        const ElementId overscroll_elasticity_element_id,
-                        const gfx::Vector2dF& elastic_overscroll);
+void CC_EXPORT CalculateDrawProperties(
+    LayerTreeImpl* layer_tree_impl,
+    RenderSurfaceList* output_render_surface_list,
+    LayerImplList* output_update_layer_list_for_testing = nullptr);
 
 }  // namespace draw_property_utils
 }  // namespace cc