cc: Merge LayerTree into the LayerTreeHost.

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index c373ec276925f00de109e31e4291fbd2e550adc2..99860870e3927d07713f2882163bbc33be2eaac7 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -26,7 +26,6 @@
 #include "cc/layers/paint_properties.h"
 #include "cc/output/filter_operations.h"
 #include "cc/trees/element_id.h"
-#include "cc/trees/layer_tree.h"
 #include "cc/trees/mutator_host_client.h"
 #include "cc/trees/property_tree.h"
 #include "cc/trees/target_property.h"
@@ -326,7 +325,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
   virtual void PushPropertiesTo(LayerImpl* layer);
 
   LayerTreeHost* GetLayerTreeHostForTesting() const { return layer_tree_host_; }
-  LayerTree* GetLayerTree() const;
 
   virtual ScrollbarLayerInterface* ToScrollbarLayer();
 
@@ -441,14 +439,14 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
 
   const gfx::Rect& update_rect() const { return inputs_.update_rect; }
 
+  LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }

[danakj, 2017/01/27 17:25:09]

There used to be this:

   LayerTreeHost* layer_tree_host() { return layer_tree_host_; }
   const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }

Is the const one never needed, there's no const Layers running around? If you
had to work around the missing const one anywhere can you add it here instead?

[Khushal, 2017/01/27 18:52:19]

Nah, I don't think the const one is used anymore. I just added this one and no
errors.

+
  protected:
   friend class LayerImpl;
   friend class TreeSynchronizer;
   virtual ~Layer();
   Layer();
 
-  LayerTreeHost* layer_tree_host() { return layer_tree_host_; }
-
   // These SetNeeds functions are in order of severity of update:
   //
   // Called when this layer has been modified in some way, but isn't sure
@@ -488,7 +486,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
  private:
   friend class base::RefCounted<Layer>;
   friend class LayerTreeHostCommon;
-  friend class LayerTree;
+  friend class LayerTreeHost;
   friend class LayerInternalsForTest;
 
   // Interactions with attached animations.
@@ -628,7 +626,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
   // This pointer value is nil when a Layer is not in a tree and is
   // updated via SetLayerTreeHost() if a layer moves between trees.
   LayerTreeHost* layer_tree_host_;
-  LayerTree* layer_tree_;
 
   Inputs inputs_;