cc: Merge LayerTree into the LayerTreeHost.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
index 1d67a59f8e450ae002ebfa96c1c958956852c8ea..d14368f00b182590f527590de18a3176a1d08228 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -14,6 +14,7 @@
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
+#include "cc/trees/layer_tree_host.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/compositing/PropertyTreeManager.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
@@ -680,11 +681,11 @@ void PaintArtifactCompositor::update(
 
   DCHECK(m_rootLayer);
 
-  cc::LayerTree* layerTree = m_rootLayer->GetLayerTree();
+  cc::LayerTreeHost* layerTreeHost = m_rootLayer->layer_tree_host();
 
   // The tree will be null after detaching and this update can be ignored.
   // See: WebViewImpl::detachPaintArtifactCompositor().
-  if (!layerTree)
+  if (!layerTreeHost)
     return;
 
   if (m_extraDataForTestingEnabled)
@@ -694,7 +695,7 @@ void PaintArtifactCompositor::update(
   m_rootLayer->set_property_tree_sequence_number(
       PropertyTreeManager::kPropertyTreeSequenceNumber);
 
-  PropertyTreeManager propertyTreeManager(*layerTree->property_trees(),
+  PropertyTreeManager propertyTreeManager(*layerTreeHost->property_trees(),
                                           m_rootLayer.get());
 
   Vector<PendingLayer, 0> pendingLayers;
@@ -740,10 +741,10 @@ void PaintArtifactCompositor::update(
   m_contentLayerClients.swap(newContentLayerClients);
 
   // Mark the property trees as having been rebuilt.
-  layerTree->property_trees()->sequence_number =
+  layerTreeHost->property_trees()->sequence_number =
       PropertyTreeManager::kPropertyTreeSequenceNumber;
-  layerTree->property_trees()->needs_rebuild = false;
-  layerTree->property_trees()->ResetCachedData();
+  layerTreeHost->property_trees()->needs_rebuild = false;
+  layerTreeHost->property_trees()->ResetCachedData();
 }
 
 #ifndef NDEBUG