Make scroll translation transform nodes reference scroll nodes

third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.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/paint/PropertyTreeState.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
@@ skipping 142 matching lines @@
   EXPECT_EQ(PropertyTreeState::None, iterator.next()->innermostNode());
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdNoElementIdOnAnyNode) {
   PropertyTreeState state(
       TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
       EffectPaintPropertyNode::root(), ScrollPaintPropertyNode::root());
   EXPECT_EQ(CompositorElementId(), state.compositorElementId());
 }
 
-TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnScrollNode) {
-  CompositorElementId expectedCompositorElementId = CompositorElementId(2, 0);
-  RefPtr<ScrollPaintPropertyNode> scroll = ScrollPaintPropertyNode::create(
-      ScrollPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
-      IntSize(), IntSize(), true, false, 0, expectedCompositorElementId);
-  PropertyTreeState state(TransformPaintPropertyNode::root(),
-                          ClipPaintPropertyNode::root(),
-                          EffectPaintPropertyNode::root(), scroll.get());
-  EXPECT_EQ(expectedCompositorElementId, state.compositorElementId());
-}
-
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnTransformNode) {
   CompositorElementId expectedCompositorElementId = CompositorElementId(2, 0);
   RefPtr<TransformPaintPropertyNode> transform =
-      TransformPaintPropertyNode::create(TransformPaintPropertyNode::root(),
-                                         TransformationMatrix(), FloatPoint3D(),
-                                         false, 0, CompositingReasonNone,
-                                         expectedCompositorElementId);
+      TransformPaintPropertyNode::create(
+          TransformPaintPropertyNode::root(), TransformationMatrix(),
+          FloatPoint3D(), nullptr, false, 0, CompositingReasonNone,
+          expectedCompositorElementId);
   PropertyTreeState state(transform.get(), ClipPaintPropertyNode::root(),
                           EffectPaintPropertyNode::root(),
                           ScrollPaintPropertyNode::root());
   EXPECT_EQ(expectedCompositorElementId, state.compositorElementId());
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnEffectNode) {
   CompositorElementId expectedCompositorElementId = CompositorElementId(2, 0);
   RefPtr<EffectPaintPropertyNode> effect = EffectPaintPropertyNode::create(
       EffectPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
       ClipPaintPropertyNode::root(), CompositorFilterOperations(), 1.0,
       SkBlendMode::kSrcOver, CompositingReasonNone,
       expectedCompositorElementId);
   PropertyTreeState state(TransformPaintPropertyNode::root(),
                           ClipPaintPropertyNode::root(), effect.get(),
                           ScrollPaintPropertyNode::root());
   EXPECT_EQ(expectedCompositorElementId, state.compositorElementId());
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnMultipleNodes) {
+  RefPtr<ScrollPaintPropertyNode> scroll = ScrollPaintPropertyNode::create(
+      ScrollPaintPropertyNode::root(), IntSize(), IntSize(), true, false, 0);
   CompositorElementId expectedCompositorElementId = CompositorElementId(2, 0);
-  RefPtr<ScrollPaintPropertyNode> scroll = ScrollPaintPropertyNode::create(
-      ScrollPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
-      IntSize(), IntSize(), true, false, 0, expectedCompositorElementId);
   RefPtr<TransformPaintPropertyNode> transform =
-      TransformPaintPropertyNode::create(TransformPaintPropertyNode::root(),
-                                         TransformationMatrix(), FloatPoint3D(),
-                                         false, 0, CompositingReasonNone,
-                                         expectedCompositorElementId);
+      TransformPaintPropertyNode::create(
+          TransformPaintPropertyNode::root(), TransformationMatrix(),
+          FloatPoint3D(), nullptr, false, 0, CompositingReasonNone,
+          expectedCompositorElementId);
   RefPtr<EffectPaintPropertyNode> effect = EffectPaintPropertyNode::create(
       EffectPaintPropertyNode::root(), TransformPaintPropertyNode::root(),
       ClipPaintPropertyNode::root(), CompositorFilterOperations(), 1.0,
       SkBlendMode::kSrcOver, CompositingReasonNone,
       expectedCompositorElementId);
   PropertyTreeState state(transform.get(), ClipPaintPropertyNode::root(),
                           effect.get(), scroll.get());
   EXPECT_EQ(expectedCompositorElementId, state.compositorElementId());
 }
 
 }  // namespace blink