Transfer LayerImpl ownership to LayerTreeImpl

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>
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/animation/target_property.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/base/synced_property.h"
 #include "cc/debug/frame_timing_request.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/draw_properties.h"
-#include "cc/layers/layer_lists.h"
+#include "cc/layers/layer_collections.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/layers/performance_properties.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/tiles/tile_priority.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
@@ skipping 59 matching lines @@
   void OnFilterAnimated(const FilterOperations& filters);
   void OnOpacityAnimated(float opacity);
   void OnTransformAnimated(const gfx::Transform& transform);
   void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset);
   void OnTransformIsPotentiallyAnimatingChanged(bool is_animating);
   bool IsActive() const;
 
   // Tree structure.
   LayerImpl* parent() { return parent_; }
   const LayerImpl* parent() const { return parent_; }
-  const OwnedLayerImplList& children() const { return children_; }
-  OwnedLayerImplList& children() { return children_; }
-  LayerImpl* child_at(size_t index) const { return children_[index].get(); }
+  const LayerImplList& children() const { return children_; }
+  LayerImplList& children() { return children_; }
+  LayerImpl* child_at(size_t index) const { return children_[index]; }
   void AddChild(scoped_ptr<LayerImpl> child);
   scoped_ptr<LayerImpl> RemoveChild(LayerImpl* child);
   void SetParent(LayerImpl* parent);
 
-  // Warning: This does not preserve tree structure invariants.
-  void ClearChildList();
-
   bool HasAncestor(const LayerImpl* ancestor) const;
 
   void SetScrollParent(LayerImpl* parent);
 
   LayerImpl* scroll_parent() { return scroll_parent_; }
   const LayerImpl* scroll_parent() const { return scroll_parent_; }
 
   void SetScrollChildren(std::set<LayerImpl*>* children);
 
   std::set<LayerImpl*>* scroll_children() { return scroll_children_.get(); }
@@ skipping 62 matching lines @@
   }
 
   void PassCopyRequests(std::vector<scoped_ptr<CopyOutputRequest>>* requests);
   // Can only be called when the layer has a copy request.
   void TakeCopyRequestsAndTransformToTarget(
       std::vector<scoped_ptr<CopyOutputRequest>>* request);
   bool HasCopyRequest() const { return !copy_requests_.empty(); }
   bool AnchestorHasCopyRequest() const;
 
   void SetMaskLayer(scoped_ptr<LayerImpl> mask_layer);
-  LayerImpl* mask_layer() { return mask_layer_.get(); }
-  const LayerImpl* mask_layer() const { return mask_layer_.get(); }
+  LayerImpl* mask_layer() { return mask_layer_; }
+  const LayerImpl* mask_layer() const { return mask_layer_; }
   scoped_ptr<LayerImpl> TakeMaskLayer();
 
   void SetReplicaLayer(scoped_ptr<LayerImpl> replica_layer);
-  LayerImpl* replica_layer() { return replica_layer_.get(); }
-  const LayerImpl* replica_layer() const { return replica_layer_.get(); }
+  LayerImpl* replica_layer() { return replica_layer_; }
+  const LayerImpl* replica_layer() const { return replica_layer_; }
   scoped_ptr<LayerImpl> TakeReplicaLayer();
 
   bool has_mask() const { return !!mask_layer_; }
   bool has_replica() const { return !!replica_layer_; }
   bool replica_has_mask() const {
     return replica_layer_ && (mask_layer_ || replica_layer_->mask_layer_);
   }
 
   LayerTreeImpl* layer_tree_impl() const { return layer_tree_impl_; }
 
@@ skipping 414 matching lines @@
   void AppendDebugBorderQuad(RenderPass* render_pass,
                              const gfx::Size& bounds,
                              const SharedQuadState* shared_quad_state,
                              AppendQuadsData* append_quads_data,
                              SkColor color,
                              float width) const;
 
   gfx::Rect GetScaledEnclosingRectInTargetSpace(float scale) const;
 
  private:
+  // Warning: This does not preserve tree structure invariants.
+  void ClearChildList();
+
   void ValidateQuadResourcesInternal(DrawQuad* quad) const;
 
   void NoteLayerPropertyChangedForDescendantsInternal();
   void PushLayerPropertyChangedForSubtreeInternal();
 
   virtual const char* LayerTypeAsString() const;
 
   // Properties internal to LayerImpl
   LayerImpl* parent_;
-  OwnedLayerImplList children_;
+  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.
   scoped_ptr<std::set<LayerImpl*>> scroll_children_;
 
   LayerImpl* clip_parent_;
   scoped_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_;
-  scoped_ptr<LayerImpl> mask_layer_;
+  LayerImpl* mask_layer_;
   int replica_layer_id_;  // ditto
-  scoped_ptr<LayerImpl> replica_layer_;
+  LayerImpl* replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
   gfx::Vector2dF bounds_delta_;
 
   // Properties synchronized from the associated Layer.
   gfx::Point3F transform_origin_;
   gfx::Size bounds_;
   int scroll_clip_layer_id_;
 
@@ skipping 103 matching lines @@
   // If true, the layer or one of its descendants has a touch handler.
   bool layer_or_descendant_has_touch_handler_;
   bool sorted_for_recursion_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_