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

third_party/WebKit/Source/core/paint/FramePainter.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/FramePainter.h"
 
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
@@ skipping 85 matching lines @@
         // The scrollbar's property nodes are similar to the frame view's
         // contents state but we want to exclude the content-specific
         // properties. This prevents the scrollbars from scrolling, for example.
         PaintChunkProperties properties(
             context.getPaintController().currentPaintChunkProperties());
         properties.propertyTreeState.setTransform(
             m_frameView->preTranslation());
         properties.propertyTreeState.setClip(
             m_frameView->contentClip()->parent());
         properties.propertyTreeState.setEffect(contentsState->effect());
-        auto* scrollBarScroll = contentsState->scroll();
-        if (m_frameView->scroll())
-          scrollBarScroll = m_frameView->scroll()->parent();
-        properties.propertyTreeState.setScroll(scrollBarScroll);

[chrishtr, 2017/01/26 21:22:58]

Did this functionality get replaced?

[pdr., 2017/01/27 20:09:32]

This shouldn't have been used. It was for painting scrollbars which don't need
scroll nodes.

         scopedPaintChunkProperties.emplace(context.getPaintController(),
                                            *frameView().layoutView(),
                                            properties);
       }
     }
 
     TransformRecorder transformRecorder(
         context, *frameView().layoutView(),
         AffineTransform::translation(frameView().x(), frameView().y()));
 
@@ skipping 130 matching lines @@
 
   bar.paint(context, CullRect(rect));
 }
 
 const FrameView& FramePainter::frameView() {
   DCHECK(m_frameView);
   return *m_frameView;
 }
 
 }  // namespace blink