Move scroll paint property nodes to be owned by the transform tree

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

Index: third_party/WebKit/Source/core/paint/BlockPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/BlockPainter.cpp b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
index c075bb176cd19ad07535c77fd724ff4eb0ae1d1a..067bd04ec12741d3effb1e61a3e8b696866663e1 100644
--- a/third_party/WebKit/Source/core/paint/BlockPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/BlockPainter.cpp
@@ -202,14 +202,12 @@ void BlockPainter::paintObject(const PaintInfo& paintInfo,
     Optional<PaintInfo> scrolledPaintInfo;
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       const auto* objectProperties = m_layoutBlock.paintProperties();
-      if (auto* scroll =
-              objectProperties ? objectProperties->scroll() : nullptr) {
+      auto* scrollTranslation =
+          objectProperties ? objectProperties->scrollTranslation() : nullptr;
+      if (scrollTranslation) {
         PaintChunkProperties properties(paintInfo.context.getPaintController()
                                             .currentPaintChunkProperties());
-        auto* scrollTranslation = objectProperties->scrollTranslation();
-        DCHECK(scrollTranslation);
         properties.propertyTreeState.setTransform(scrollTranslation);
-        properties.propertyTreeState.setScroll(scroll);
         m_scopedScrollProperty.emplace(
             paintInfo.context.getPaintController(), m_layoutBlock,
             DisplayItem::paintPhaseToDrawingType(paintPhase), properties);