cc : Push layer lists instead of layer tree at commit and activation

cc/trees/layer_tree_impl.h

 // Copyright 2012 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_LAYER_TREE_IMPL_H_
 #define CC_TREES_LAYER_TREE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 117 matching lines @@
   // Tracing methods.
   // ---------------------------------------------------------------------------
   void GetAllPrioritizedTilesForTracing(
       std::vector<PrioritizedTile>* prioritized_tiles) const;
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   // Other public methods
   // ---------------------------------------------------------------------------
   LayerImpl* root_layer() const { return root_layer_; }
   void SetRootLayer(std::unique_ptr<LayerImpl>);
+  void SetRootLayerFromLayerList();
   bool IsRootLayer(const LayerImpl* layer) const;
   std::unique_ptr<OwnedLayerImplList> DetachLayers();
 
   void SetPropertyTrees(PropertyTrees* property_trees);
   PropertyTrees* property_trees() { return &property_trees_; }
 
   void UpdatePropertyTreesForBoundsDelta();
 
   void PushPropertiesTo(LayerTreeImpl* tree_impl);
 
   void MoveChangeTrackingToLayers();
 
-  LayerListIterator<LayerImpl> begin() const;
-  LayerListIterator<LayerImpl> end() const;
-  LayerListReverseIterator<LayerImpl> rbegin();
-  LayerListReverseIterator<LayerImpl> rend();
+  LayerImplList::const_iterator begin() const;
+  LayerImplList::const_iterator end() const;
+  LayerImplList::reverse_iterator rbegin();
+  LayerImplList::reverse_iterator rend();
 
   struct CC_EXPORT ElementLayers {
     // Transform and opacity mutations apply to this layer.
     LayerImpl* main = nullptr;
     // Scroll mutations apply to this layer.
     LayerImpl* scroll = nullptr;
   };
 
   void AddToElementMap(LayerImpl* layer);
   void RemoveFromElementMap(LayerImpl* layer);
@@ skipping 218 matching lines @@
 
   void RegisterScrollbar(ScrollbarLayerImplBase* scrollbar_layer);
   void UnregisterScrollbar(ScrollbarLayerImplBase* scrollbar_layer);
   ScrollbarSet ScrollbarsFor(int scroll_layer_id) const;
 
   void RegisterScrollLayer(LayerImpl* layer);
   void UnregisterScrollLayer(LayerImpl* layer);
 
   void AddSurfaceLayer(LayerImpl* layer);
   void RemoveSurfaceLayer(LayerImpl* layer);
-  const std::vector<LayerImpl*>& SurfaceLayers() const {
-    return surface_layers_;
-  }
+  const LayerImplList& SurfaceLayers() const { return surface_layers_; }
 
   LayerImpl* FindFirstScrollingLayerOrScrollbarLayerThatIsHitByPoint(
       const gfx::PointF& screen_space_point);
 
   LayerImpl* FindLayerThatIsHitByPoint(const gfx::PointF& screen_space_point);
 
   LayerImpl* FindLayerThatIsHitByPointInTouchHandlerRegion(
       const gfx::PointF& screen_space_point);
 
   void RegisterSelection(const LayerSelection& selection);
@@ skipping 62 matching lines @@
     return event_listener_properties_[static_cast<size_t>(event_class)];
   }
   void set_event_listener_properties(EventListenerClass event_class,
                                      EventListenerProperties event_properties) {
     event_listener_properties_[static_cast<size_t>(event_class)] =
         event_properties;
   }
 
   void ResetAllChangeTracking();
 
+  void AddToLayerList(LayerImpl* layer);
+
+  void ClearLayerList();
+
+  void BuildLayerListForTesting();
+
  protected:
   explicit LayerTreeImpl(
       LayerTreeHostImpl* layer_tree_host_impl,
       scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor,
       scoped_refptr<SyncedTopControls> top_controls_shown_ratio,
       scoped_refptr<SyncedElasticOverscroll> elastic_overscroll);
   float ClampPageScaleFactorToLimits(float page_scale_factor) const;
   void PushPageScaleFactorAndLimits(const float* page_scale_factor,
                                     float min_page_scale_factor,
                                     float max_page_scale_factor);
@@ skipping 24 matching lines @@
   float min_page_scale_factor_;
   float max_page_scale_factor_;
 
   float device_scale_factor_;
   float painted_device_scale_factor_;
 
   scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
 
   std::unique_ptr<OwnedLayerImplList> layers_;
   LayerImplMap layer_id_map_;
-  std::vector<LayerImpl*> layer_list_;
+  LayerImplList layer_list_;
   // Set of layers that need to push properties.
   std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
 
   std::unordered_map<uint64_t, ElementLayers> element_layers_map_;
 
   std::unordered_map<int, float> opacity_animations_map_;
   std::unordered_map<int, gfx::Transform> transform_animations_map_;
 
   // Maps from clip layer ids to scroll layer ids.  Note that this only includes
   // the subset of clip layers that act as scrolling containers.  (This is
   // derived from LayerImpl::scroll_clip_layer_ and exists to avoid O(n) walks.)
   std::unordered_map<int, int> clip_scroll_map_;
 
   // Maps scroll layer ids to scrollbar layer ids.  For each scroll layer, there
   // may be 1 or 2 scrollbar layers (for vertical and horizontal).  (This is
   // derived from ScrollbarLayerImplBase::scroll_layer_id_ and exists to avoid
   // O(n) walks.)
   std::multimap<int, int> scrollbar_map_;
 
   std::vector<PictureLayerImpl*> picture_layers_;
-  std::vector<LayerImpl*> surface_layers_;
+  LayerImplList surface_layers_;
 
   // List of visible layers for the most recently prepared frame.
   LayerImplList render_surface_layer_list_;
   // After drawing the |render_surface_layer_list_| the areas in this region
   // would not be fully covered by opaque content.
   Region unoccluded_screen_space_region_;
 
   bool viewport_size_invalid_;
   bool needs_update_draw_properties_;
 
@@ skipping 19 matching lines @@
   bool top_controls_shrink_blink_size_;
   float top_controls_height_;
 
   // The amount that the top controls are shown from 0 (hidden) to 1 (fully
   // shown).
   scoped_refptr<SyncedTopControls> top_controls_shown_ratio_;
 
   std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
  private:
-  void BuildLayerListForTesting();
   DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_IMPL_H_