WIP: Construct SPV2's scroll paint property tree

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
index 65b51facee107278481b66940237bd329a578948..049877a213412c8e90d1c82cfbe40c7d33c5b7ed 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -8,6 +8,7 @@
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
 #include "platform/graphics/paint/GeometryMapper.h"
+#include "platform/graphics/paint/ScrollPaintPropertyNode.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ -78,6 +79,14 @@ public:
         return frameView->contentClip();
     }
 
+    const ScrollPaintPropertyNode* frameScroll()
+    {
+        FrameView* frameView = document().view();
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+            return frameView->layoutView()->objectPaintProperties()->scroll();
+        return frameView->scroll();
+    }
+
 private:
     void SetUp() override
     {
@@ -173,6 +182,7 @@ TEST_P(PaintPropertyTreeBuilderTest, PositionAndScroll)
     EXPECT_EQ(TransformationMatrix().translate(0, -100), scrollerProperties->scrollTranslation()->matrix());
     EXPECT_EQ(frameScrollTranslation(), scrollerProperties->scrollTranslation()->parent());
     EXPECT_EQ(frameScrollTranslation(), scrollerProperties->overflowClip()->localTransformSpace());
+    EXPECT_EQ(frameScroll(), scrollerProperties->scroll()->parent());
     EXPECT_EQ(FloatRoundedRect(120, 340, 400, 300), scrollerProperties->overflowClip()->clipRect());
     EXPECT_EQ(frameContentClip(), scrollerProperties->overflowClip()->parent());
     // http://crbug.com/638415