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

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

 // Copyright 2014 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 "core/paint/BlockPainter.h"
 
 #include "core/editing/DragCaret.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 184 matching lines @@
 
   if (paintPhase == PaintPhaseForeground && paintInfo.isPrinting())
     ObjectPainter(m_layoutBlock).addPDFURLRectIfNeeded(paintInfo, paintOffset);
 
   if (paintPhase != PaintPhaseSelfOutlineOnly) {
     Optional<ScopedPaintChunkProperties> m_scopedScrollProperty;
     Optional<ScrollRecorder> scrollRecorder;
     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);
         scrolledPaintInfo.emplace(paintInfo);
         scrolledPaintInfo->updateCullRect(
             scrollTranslation->matrix().toAffineTransform());
       }
     } else if (m_layoutBlock.hasOverflowClip()) {
       IntSize scrollOffset = m_layoutBlock.scrolledContentOffset();
       if (m_layoutBlock.layer()->scrollsOverflow() || !scrollOffset.isZero()) {
@@ skipping 80 matching lines @@
 }
 
 void BlockPainter::paintContents(const PaintInfo& paintInfo,
                                  const LayoutPoint& paintOffset) {
   DCHECK(!m_layoutBlock.childrenInline());
   PaintInfo paintInfoForDescendants = paintInfo.forDescendants();
   m_layoutBlock.paintChildren(paintInfoForDescendants, paintOffset);
 }
 
 }  // namespace blink