Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

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

Issue 2137173002: [SPv2] Respect transform-style in the Blink and cc property trees. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: large merge (with https://codereview.chromium.org/2144823006) Created 4 years, 5 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
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 5e552c2b831d41bcbec65d4804ad153d25362798..da3c47056d82795de41e10be38b9c866c35d6033 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -415,6 +415,8 @@ int PropertyTreeManager::compositorIdForTransformNode(const TransformPaintProper
compositorNode.post_local.matrix().setTranslate(
origin.x(), origin.y(), origin.z());
compositorNode.needs_local_transform_update = true;
+ compositorNode.flattens_inherited_transform = transformNode->flattensInheritedTransform();
+ compositorNode.sorting_context_id = transformNode->renderingContextID();
m_rootLayer->AddChild(dummyLayer);
dummyLayer->SetTransformTreeIndex(id);
@@ -585,6 +587,10 @@ void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
layer->SetEffectTreeIndex(effectId);
layer->SetScrollTreeIndex(kRealRootNodeId);
+ // 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);
+
if (m_extraDataForTestingEnabled)
m_extraDataForTesting->contentLayers.append(layer);
}

Powered by Google App Engine
This is Rietveld 408576698