Set owning layer id on transform nodes in SPv2.

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

 // Copyright 2016 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/PaintArtifactCompositor.h"
 
 #include <memory>
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 697 matching lines @@
 
   EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
             scrollNode.main_thread_scrolling_reasons);
 
   auto* layer = contentLayerAt(0);
   EXPECT_EQ(layer->id(), scrollNode.owning_layer_id);
   auto scrollNodeIndex =
       propertyTrees().scroll_tree.FindNodeIndexFromOwningLayerId(layer->id());
   EXPECT_EQ(scrollNodeIndex, scrollNode.id);
 
+  // Only one content layer, and the first child layer is the dummy layer for
+  // the transform node.
+  const cc::Layer* transformNodeLayer = rootLayer()->children()[0].get();
+  EXPECT_EQ(transformNodeLayer->id(), transformNode.owning_layer_id);
+  auto transformNodeIndex =
+      propertyTrees().transform_tree.FindNodeIndexFromOwningLayerId(
+          transformNodeLayer->id());
+  EXPECT_EQ(transformNodeIndex, transformNode.id);
+
   EXPECT_EQ(0u, scrollClient.didScrollCount);
   layer->SetScrollOffsetFromImplSide(gfx::ScrollOffset(1, 2));
   EXPECT_EQ(1u, scrollClient.didScrollCount);
   EXPECT_EQ(gfx::ScrollOffset(1, 2), scrollClient.lastScrollOffset);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, TransformUnderScrollNode) {
   RefPtr<TransformPaintPropertyNode> scrollTranslation =
       TransformPaintPropertyNode::createScrollTranslation(
           TransformPaintPropertyNode::root(),
@@ skipping 854 matching lines @@
   TestPaintArtifact artifact;
   artifact
       .chunk(transform, ClipPaintPropertyNode::root(),
              EffectPaintPropertyNode::root())
       .rectDrawing(FloatRect(100, 100, 200, 100), Color::black);
   update(artifact.build());
 
   EXPECT_EQ(2, elementIdToTransformNodeIndex(expectedCompositorElementId));
 }
 
+TEST_F(PaintArtifactCompositorTestWithPropertyTrees,
+       TransformNodeHasOwningLayerId) {
+  RefPtr<TransformPaintPropertyNode> transform =
+      TransformPaintPropertyNode::create(
+          TransformPaintPropertyNode::root(), TransformationMatrix().rotate(90),
+          FloatPoint3D(100, 100, 0), false, 0, CompositingReason3DTransform);
+
+  TestPaintArtifact artifact;
+  artifact
+      .chunk(transform, ClipPaintPropertyNode::root(),
+             EffectPaintPropertyNode::root())
+      .rectDrawing(FloatRect(100, 100, 200, 100), Color::black);
+  update(artifact.build());
+
+  // Only one content layer, and the first child layer is the dummy layer for
+  // the transform node.
+  ASSERT_EQ(1u, contentLayerCount());
+  const cc::Layer* transformNodeLayer = rootLayer()->children()[0].get();
+  const cc::TransformNode* ccTransformNode =
+      propertyTrees().transform_tree.Node(
+          transformNodeLayer->transform_tree_index());
+  EXPECT_EQ(transformNodeLayer->id(), ccTransformNode->owning_layer_id);
+  auto transformNodeIndex =
+      propertyTrees().transform_tree.FindNodeIndexFromOwningLayerId(
+          transformNodeLayer->id());
+  EXPECT_EQ(transformNodeIndex, ccTransformNode->id);
+}
+
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, EffectWithElementId) {
   CompositorElementId expectedCompositorElementId(2, 0);
   float opacity = 2.0 / 255.0;
   RefPtr<EffectPaintPropertyNode> effect = EffectPaintPropertyNode::create(
       EffectPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
       ClipPaintPropertyNode::root(), ColorFilterNone,
       CompositorFilterOperations(), opacity, SkBlendMode::kSrcOver,
       CompositingReasonActiveAnimation, expectedCompositorElementId);
 
   TestPaintArtifact artifact;
@@ skipping 355 matching lines @@
   EXPECT_EQ(gfx::Size(50, 50), layer3->bounds());
   EXPECT_EQ(effectNode->id, layer3->effect_tree_index());
 
   const cc::Layer* layer4 = contentLayerAt(3);
   EXPECT_EQ(gfx::Vector2dF(100.f, 0.f), layer4->offset_to_transform_parent());
   EXPECT_EQ(gfx::Size(150, 150), layer4->bounds());
   EXPECT_EQ(1, layer4->effect_tree_index());
 }
 
 }  // namespace blink