cc : Stop pushing properties not used by LayerImpl to LayerImpl (4)

cc/layers/layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 89 matching lines @@
   bool OpacityCanAnimateOnImplThread() const { return false; }
 
   // Tree structure.
   LayerImpl* parent() { return parent_; }
   LayerImplList& children() { return children_; }
   LayerImpl* child_at(size_t index) const { return children_[index]; }
   void AddChild(std::unique_ptr<LayerImpl> child);
   std::unique_ptr<LayerImpl> RemoveChildForTesting(LayerImpl* child);
   void SetParent(LayerImpl* parent);
 
-  void SetScrollParent(LayerImpl* parent);
-
-  LayerImpl* scroll_parent() { return scroll_parent_; }
-
-  void SetScrollChildren(std::set<LayerImpl*>* children);
-
-  std::set<LayerImpl*>* scroll_children() { return scroll_children_.get(); }
-  const std::set<LayerImpl*>* scroll_children() const {
-    return scroll_children_.get();
-  }
-
   void DistributeScroll(ScrollState* scroll_state);
   void ApplyScroll(ScrollState* scroll_state);
 
   void set_property_tree_sequence_number(int sequence_number) {}
 
   void SetTransformTreeIndex(int index);
   int transform_tree_index() const { return transform_tree_index_; }
 
   void SetClipTreeIndex(int index);
   int clip_tree_index() const { return clip_tree_index_; }
@@ skipping 22 matching lines @@
 
   bool is_clipped() const { return draw_properties_.is_clipped; }
 
   void UpdatePropertyTreeTransform();
   void UpdatePropertyTreeTransformIsAnimated(bool is_animated);
   void UpdatePropertyTreeOpacity();
   void UpdatePropertyTreeScrollOffset();
 
   // For compatibility with Layer.
   bool has_render_surface() const { return !!render_surface(); }
-  void SetClipParent(LayerImpl* ancestor);
-
-  LayerImpl* clip_parent() {
-    return clip_parent_;
-  }
-
-  void SetClipChildren(std::set<LayerImpl*>* children);
-
-  std::set<LayerImpl*>* clip_children() { return clip_children_.get(); }
-  const std::set<LayerImpl*>* clip_children() const {
-    return clip_children_.get();
-  }
 
   void PassCopyRequests(
       std::vector<std::unique_ptr<CopyOutputRequest>>* requests);
   // Can only be called when the layer has a copy request.
   void TakeCopyRequestsAndTransformToTarget(
       std::vector<std::unique_ptr<CopyOutputRequest>>* request);
   bool HasCopyRequest() const { return !copy_requests_.empty(); }
   bool InsideCopyRequest() const;
 
   void SetMaskLayer(std::unique_ptr<LayerImpl> mask_layer);
@@ skipping 395 matching lines @@
 
   void NoteLayerPropertyChangedForDescendantsInternal();
   void PushLayerPropertyChangedForSubtreeInternal();
 
   virtual const char* LayerTypeAsString() const;
 
   // Properties internal to LayerImpl
   LayerImpl* parent_;
   LayerImplList children_;
 
-  LayerImpl* scroll_parent_;
-
-  // Storing a pointer to a set rather than a set since this will be rarely
-  // used. If this pointer turns out to be too heavy, we could have this (and
-  // the scroll parent above) be stored in a LayerImpl -> scroll_info
-  // map somewhere.
-  std::unique_ptr<std::set<LayerImpl*>> scroll_children_;
-
-  LayerImpl* clip_parent_;
-  std::unique_ptr<std::set<LayerImpl*>> clip_children_;
-
   // mask_layer_ can be temporarily stolen during tree sync, we need this ID to
   // confirm newly assigned layer is still the previous one
   int mask_layer_id_;
   LayerImpl* mask_layer_;
   int replica_layer_id_;  // ditto
   LayerImpl* replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
   std::unique_ptr<LayerImplTestProperties> test_properties_;
@@ skipping 87 matching lines @@
   bool scrolls_drawn_descendant_;
   // If true, the layer or one of its descendants has a touch handler.
   bool layer_or_descendant_has_touch_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_