Reland PaintChunk::id

third_party/WebKit/Source/core/paint/ScrollableAreaPainter.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/ScrollableAreaPainter.h"
 
 #include "core/layout/LayoutView.h"
 #include "core/page/Page.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPaintProperties.h"
@@ skipping 115 matching lines @@
     if (paintingOverlayControls && !getScrollableArea().hasOverlayScrollbars())
         return;
 
     {
         Optional<ScopedPaintChunkProperties> scopedTransformProperty;
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
             const auto* objectProperties = getScrollableArea().box().objectPaintProperties();
             if (objectProperties && objectProperties->scrollbarPaintOffset()) {
                 PaintChunkProperties properties(context.getPaintController().currentPaintChunkProperties());
                 properties.transform = objectProperties->scrollbarPaintOffset();
-                scopedTransformProperty.emplace(context.getPaintController(), properties);
+                scopedTransformProperty.emplace(context.getPaintController(), getScrollableArea().box(), DisplayItem::ScrollOverflowControls, properties);
             }
         }
         if (getScrollableArea().horizontalScrollbar() && !getScrollableArea().layerForHorizontalScrollbar()) {
             TransformRecorder translateRecorder(context, *getScrollableArea().horizontalScrollbar(), AffineTransform::translation(adjustedPaintOffset.x(), adjustedPaintOffset.y()));
             getScrollableArea().horizontalScrollbar()->paint(context, adjustedCullRect);
         }
         if (getScrollableArea().verticalScrollbar() && !getScrollableArea().layerForVerticalScrollbar()) {
             TransformRecorder translateRecorder(context, *getScrollableArea().verticalScrollbar(), AffineTransform::translation(adjustedPaintOffset.x(), adjustedPaintOffset.y()));
             getScrollableArea().verticalScrollbar()->paint(context, adjustedCullRect);
         }
@@ skipping 54 matching lines @@
     LayoutObjectDrawingRecorder recorder(context, getScrollableArea().box(), DisplayItem::ScrollbarCorner, absRect);
     context.fillRect(absRect, Color::white);
 }
 
 PaintLayerScrollableArea& ScrollableAreaPainter::getScrollableArea() const
 {
     return *m_scrollableArea;
 }
 
 } // namespace blink