[NOT FOR REVIEW]

cc/trees/draw_property_utils.h

Index: cc/trees/draw_property_utils.h
diff --git a/cc/trees/draw_property_utils.h b/cc/trees/draw_property_utils.h
index 4e9e0227336c2ed70edc532b7fec96eb9857e091..1f496731247082596df9d9a07607053ae9aa1ec4 100644
--- a/cc/trees/draw_property_utils.h
+++ b/cc/trees/draw_property_utils.h
@@ -10,6 +10,7 @@
 
 namespace gfx {
 class Rect;
+class RectF;
 class Transform;
 class Vector2dF;
 }  // namespace gfx
@@ -32,10 +33,10 @@ void CC_EXPORT PostConcatSurfaceContentsScale(const EffectNode* effect_node,
 
 void CC_EXPORT ConcatInverseSurfaceContentsScale(const EffectNode* effect_node,
                                                  gfx::Transform* transform);
-// Computes combined clips for every node in |clip_tree|. This function requires
-// that |transform_tree| has been updated via |ComputeTransforms|.
-void CC_EXPORT ComputeClips(PropertyTrees* property_trees,
-                            bool non_root_surfaces_enabled);
+
+gfx::RectF CC_EXPORT
+ComputeAccumulatedClipInRootSpaceForVisibleRect(PropertyTrees* property_trees,
+                                                int local_clip_id);
 
 // Computes combined (screen space) transforms for every node in the transform
 // tree. This must be done prior to calling |ComputeClips|.
@@ -72,11 +73,8 @@ void CC_EXPORT ComputeVisibleRects(LayerImpl* root_layer,
                                    LayerImplList* visible_layer_list);
 
 gfx::Rect CC_EXPORT
-ComputeLayerVisibleRectDynamic(const PropertyTrees* property_trees,
+ComputeLayerVisibleRectDynamic(PropertyTrees* property_trees,
                                const LayerImpl* layer);
-void CC_EXPORT
-VerifyVisibleRectsCalculations(const LayerImplList& layer_list,
-                               const PropertyTrees* property_trees);
 
 void CC_EXPORT ComputeLayerDrawProperties(LayerImpl* layer,
                                           const PropertyTrees* property_trees);
@@ -84,7 +82,7 @@ void CC_EXPORT ComputeLayerDrawProperties(LayerImpl* layer,
 void CC_EXPORT ComputeMaskDrawProperties(LayerImpl* mask_layer,
                                          const PropertyTrees* property_trees);
 
-void CC_EXPORT ComputeSurfaceDrawProperties(const PropertyTrees* property_trees,
+void CC_EXPORT ComputeSurfaceDrawProperties(PropertyTrees* property_trees,
                                             RenderSurfaceImpl* render_surface);
 
 bool CC_EXPORT LayerShouldBeSkipped(LayerImpl* layer,
@@ -99,9 +97,6 @@ bool CC_EXPORT LayerNeedsUpdate(LayerImpl* layer,
                                 bool layer_is_drawn,
                                 const PropertyTrees* property_trees);
 
-void CC_EXPORT VerifyClipTreeCalculations(const LayerImplList& layer_list,
-                                          PropertyTrees* property_trees);
-
 gfx::Transform CC_EXPORT DrawTransform(const LayerImpl* layer,
                                        const TransformTree& transform_tree,
                                        const EffectTree& effect_tree);