Set owning layer id on transform nodes in SPv2.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/compositing/PropertyTreeManager.h"
 
 #include "cc/layers/layer.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
@@ skipping 56 matching lines @@
 void PropertyTreeManager::setupRootTransformNode() {
   // cc is hardcoded to use transform node index 1 for device scale and
   // transform.
   cc::TransformTree& transformTree = m_propertyTrees.transform_tree;
   transformTree.clear();
   m_propertyTrees.element_id_to_transform_node_index.clear();
   cc::TransformNode& transformNode = *transformTree.Node(
       transformTree.Insert(cc::TransformNode(), kRealRootNodeId));
   DCHECK_EQ(transformNode.id, kSecondaryRootNodeId);
   transformNode.source_node_id = transformNode.parent_id;
+  transformNode.owning_layer_id = m_rootLayer->id();

[chrishtr, 2017/04/06 18:15:21]

Please add a comment here and in the other instance that this is temporary,
and make sure there is a bug tracking the final solution.

[wkorman, 2017/04/06 18:48:26]

Done. Note we were already setting owning_layer_id in scroll, clip, and effect
nodes. Some of those are probably not animation specific, and removal could
require other work. I am only adding comment to the two transform node refs here
for now.

+  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
   // cc.
   float deviceScaleFactor =
       m_rootLayer->layer_tree_host()->device_scale_factor();
   gfx::Transform toScreen;
   toScreen.Scale(deviceScaleFactor, deviceScaleFactor);
   transformTree.SetToScreen(kRealRootNodeId, toScreen);
   gfx::Transform fromScreen;
@@ skipping 69 matching lines @@
   auto it = m_transformNodeMap.find(transformNode);
   if (it != m_transformNodeMap.end())
     return it->value;
 
   scoped_refptr<cc::Layer> dummyLayer = cc::Layer::Create();
   int parentId = ensureCompositorTransformNode(transformNode->parent());
   int id = transformTree().Insert(cc::TransformNode(), parentId);
 
   cc::TransformNode& compositorNode = *transformTree().Node(id);
   compositorNode.source_node_id = parentId;
+  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(),
                                                  -origin.z());
   compositorNode.local.matrix() =
       TransformationMatrix::toSkMatrix44(transformNode->matrix());
   compositorNode.post_local.matrix().setTranslate(origin.x(), origin.y(),
                                                   origin.z());
   compositorNode.needs_local_transform_update = true;
   compositorNode.flattens_inherited_transform =
@@ skipping 263 matching lines @@
   m_effectStack.push_back(BlinkEffectAndCcIdPair{nextEffect, effectNode.id});
 
   dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
   dummyLayer->SetTransformTreeIndex(kSecondaryRootNodeId);
   dummyLayer->SetClipTreeIndex(outputClipId);
   dummyLayer->SetEffectTreeIndex(effectNode.id);
   dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
 }
 
 }  // namespace blink