third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp - Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost.

Unified Diff: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change

Patch Set: remove unused test file. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« cc/layers/layer_unittest.cc ('K') | « content/renderer/render_view_browsertest.cc ('k') | third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a5224687dc758d16366c9649663255015a998e74..6b51985c222a969c284b7189095f6a3ae1dbfd3d 100644

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

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

@@ -566,7 +566,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);

@@ -574,7 +574,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()) {

@@ -596,7 +596,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);

@@ -605,8 +605,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