cc: Move data to LayerTree from 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 66b643199f7b05353be93b8a6c4dcd97e053f931..e4d7b169e3593508e8e3faeaa948eac01fee321a 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -558,7 +558,7 @@ void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
 {
     cc::LayerTreeHost* host = m_rootLayer->layer_tree_host();
 
-    setMinimalPropertyTrees(host->property_trees(), m_rootLayer->id());
+    setMinimalPropertyTrees(host->GetLayerTree()->property_trees(), m_rootLayer->id());
     m_rootLayer->RemoveAllChildren();
     m_rootLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
     m_rootLayer->SetTransformTreeIndex(kSecondaryRootNodeId);
@@ -566,7 +566,7 @@ void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
     m_rootLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
     m_rootLayer->SetScrollTreeIndex(kRealRootNodeId);
 
-    PropertyTreeManager propertyTreeManager(*host->property_trees(), m_rootLayer.get());
+    PropertyTreeManager propertyTreeManager(*host->GetLayerTree()->property_trees(), m_rootLayer.get());
     m_contentLayerClients.clear();
     m_contentLayerClients.reserveCapacity(paintArtifact.paintChunks().size());
     for (const PaintChunk& paintChunk : paintArtifact.paintChunks()) {
@@ -588,7 +588,7 @@ void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
 
         // TODO(jbroman): This probably shouldn't be necessary, but it is still
         // queried by RenderSurfaceImpl.
-        layer->Set3dSortingContextId(host->property_trees()->transform_tree.Node(transformId)->sorting_context_id);
+        layer->Set3dSortingContextId(host->GetLayerTree()->property_trees()->transform_tree.Node(transformId)->sorting_context_id);
 
         layer->SetShouldCheckBackfaceVisibility(paintChunk.properties.backfaceHidden);
 
@@ -597,8 +597,8 @@ void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
     }
 
     // Mark the property trees as having been rebuilt.
-    host->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
-    host->property_trees()->needs_rebuild = false;
+    host->GetLayerTree()->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
+    host->GetLayerTree()->property_trees()->needs_rebuild = false;
 }
 
 } // namespace blink