cc: Make LayerTreeHost a protected Layer member.

cc/trees/layer_tree.h

 // Copyright 2016 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_H_
 #define CC_TREES_LAYER_TREE_H_
 
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
@@ skipping 106 matching lines @@
   float device_scale_factor() const { return inputs_.device_scale_factor; }
 
   void SetPaintedDeviceScaleFactor(float painted_device_scale_factor);
 
   // Used externally by blink for setting the PropertyTrees when
   // |settings_.use_layer_lists| is true. This is a SPV2 setting.
   PropertyTrees* property_trees() { return &property_trees_; }
 
   void SetNeedsDisplayOnAllLayers();
 
+  void SetNeedsCommit();
+
+  const LayerTreeSettings& GetSettings() const;
+
   // Methods which should only be used internally in cc ------------------
   void RegisterLayer(Layer* layer);
   void UnregisterLayer(Layer* layer);
   Layer* LayerById(int id) const;
 
   bool UpdateLayers(const LayerList& update_layer_list,
                     bool* content_is_suitable_for_gpu);
   bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
 
   void AddLayerShouldPushProperties(Layer* layer);
@@ skipping 10 matching lines @@
   void SetPageScaleFromImplSide(float page_scale);
   void SetElasticOverscrollFromImplSide(gfx::Vector2dF elastic_overscroll);
   gfx::Vector2dF elastic_overscroll() const { return elastic_overscroll_; }
 
   void UpdateHudLayer(bool show_hud_info);
   HeadsUpDisplayLayer* hud_layer() const { return hud_layer_.get(); }
 
   virtual void SetNeedsFullTreeSync();
   bool needs_full_tree_sync() const { return needs_full_tree_sync_; }
 
-  void SetNeedsCommit();
   void SetPropertyTreesNeedRebuild();
 
   void PushPropertiesTo(LayerTreeImpl* tree_impl);
 
   void ToProtobuf(proto::LayerTree* proto);
   void FromProtobuf(const proto::LayerTree& proto);
 
   AnimationHost* animation_host() const { return animation_host_.get(); }
 
   Layer* LayerByElementId(ElementId element_id) const;
   void RegisterElement(ElementId element_id,
                        ElementListType list_type,
                        Layer* layer);
   void UnregisterElement(ElementId element_id,
                          ElementListType list_type,
                          Layer* layer);
   void SetElementIdsForTesting();
 
+  void BuildPropertyTreesForTesting();
+
   // Layer iterators.
   LayerListIterator<Layer> begin() const;
   LayerListIterator<Layer> end() const;
   LayerListReverseIterator<Layer> rbegin();
   LayerListReverseIterator<Layer> rend();
   // ---------------------------------------------------------------------
 
  private:
   friend class LayerTreeHostSerializationTest;
 
@@ skipping 93 matching lines @@
 
   std::unique_ptr<AnimationHost> animation_host_;
   LayerTreeHost* layer_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTree);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_H_