cc : Clean up cc clip tree

cc/trees/property_tree.h

 // Copyright 2014 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.
 
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 530 matching lines @@
   DrawTransforms transforms;
 
   // TODO(sunxd): Move screen space transforms here if it can improve
   // performance.
   DrawTransformData()
       : update_number(-1),
         target_id(EffectTree::kInvalidNodeId),
         transforms(gfx::Transform(), gfx::Transform()) {}
 };
 
+struct ConditionalClip {
+  bool is_clipped;
+  gfx::RectF clip_rect;
+};
+
+struct ClipRectData {
+  int target_id;
+  ConditionalClip clip;
+
+  ClipRectData() : target_id(-1) {}
+};
+
 struct PropertyTreesCachedData {
   int transform_tree_update_number;
   std::vector<AnimationScaleData> animation_scales;
   mutable std::vector<std::vector<DrawTransformData>> draw_transforms;
 
   PropertyTreesCachedData();
   ~PropertyTreesCachedData();
 };
 
 class CC_EXPORT PropertyTrees final {
@@ skipping 86 matching lines @@
   bool GetFromTarget(int transform_id,
                      int effect_id,
                      gfx::Transform* from_target) const;
 
   void ResetCachedData();
   void UpdateTransformTreeUpdateNumber();
   gfx::Transform ToScreenSpaceTransformWithoutSurfaceContentsScale(
       int transform_id,
       int effect_id) const;
 
+  ClipRectData& FetchClipRectFromCache(int clip_id, int target_id);
+
  private:
   gfx::Vector2dF inner_viewport_container_bounds_delta_;
   gfx::Vector2dF outer_viewport_container_bounds_delta_;
   gfx::Vector2dF inner_viewport_scroll_bounds_delta_;
 
   // GetDrawTransforms may change the value of cached_data_.
   DrawTransforms& GetDrawTransforms(int transform_id, int effect_id) const;
   DrawTransformData& FetchDrawTransformsDataFromCache(int transform_id,
                                                       int effect_id) const;
 
   PropertyTreesCachedData cached_data_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_