Revert of PaintChunk::id

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/DragCaretController.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutFlexibleBox.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 143 matching lines @@
 
     if (paintPhase != PaintPhaseSelfOutlineOnly) {
         Optional<ScopedPaintChunkProperties> m_scopedScrollProperty;
         Optional<ScrollRecorder> scrollRecorder;
         Optional<PaintInfo> scrolledPaintInfo;
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
             const auto* objectProperties = m_layoutBlock.objectPaintProperties();
             if (auto* scrollTranslation = objectProperties ? objectProperties->scrollTranslation() : nullptr) {
                 PaintChunkProperties properties(paintInfo.context.getPaintController().currentPaintChunkProperties());
                 properties.transform = scrollTranslation;
-                m_scopedScrollProperty.emplace(paintInfo.context.getPaintController(), m_layoutBlock, DisplayItem::paintPhaseToDrawingType(paintPhase), properties);
+                m_scopedScrollProperty.emplace(paintInfo.context.getPaintController(), 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()) {
                 scrollRecorder.emplace(paintInfo.context, m_layoutBlock, paintPhase, scrollOffset);
                 scrolledPaintInfo.emplace(paintInfo);
                 AffineTransform transform;
                 transform.translate(-scrollOffset.width(), -scrollOffset.height());
@@ skipping 69 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