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

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

Issue 2800983002: Set owning layer id on transform nodes in SPv2. (Closed)
Patch Set: Add comments. Created 3 years, 8 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
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
index 370a641608869b40252b6a99ceecf40e1cdf5672..50c72f9a91301d493f2b4e3a0cb4ff86729fefea 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
@@ -74,6 +74,12 @@ void PropertyTreeManager::setupRootTransformNode() {
transformTree.Insert(cc::TransformNode(), kRealRootNodeId));
DCHECK_EQ(transformNode.id, kSecondaryRootNodeId);
transformNode.source_node_id = transformNode.parent_id;
+ // Setting owning layer id on cc property tree transform nodes is temporary
+ // until we can remove animation subsystem dependency on layer
+ // references. http://crbug.com/709137
+ transformNode.owning_layer_id = m_rootLayer->id();
+ transformTree.SetOwningLayerIdForNode(&transformNode,
+ transformNode.owning_layer_id);
// TODO(jaydasika): We shouldn't set ToScreen and FromScreen of root
// transform node here. They should be set while updating transform tree in
@@ -163,6 +169,12 @@ int PropertyTreeManager::ensureCompositorTransformNode(
cc::TransformNode& compositorNode = *transformTree().Node(id);
compositorNode.source_node_id = parentId;
+ // Setting owning layer id on cc property tree transform nodes is temporary
+ // until we can remove animation subsystem dependency on layer
+ // references. http://crbug.com/709137
+ compositorNode.owning_layer_id = dummyLayer->id();
+ transformTree().SetOwningLayerIdForNode(&compositorNode,
+ compositorNode.owning_layer_id);
FloatPoint3D origin = transformNode->origin();
compositorNode.pre_local.matrix().setTranslate(-origin.x(), -origin.y(),
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698