Revert of PaintChunk::id

third_party/WebKit/Source/core/paint/BoxClipper.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/BoxClipper.h"
 
 #include "core/layout/LayoutBox.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
@@ skipping 12 matching lines @@
     ASSERT(m_paintInfo.phase != PaintPhaseSelfBlockBackgroundOnly && m_paintInfo.phase != PaintPhaseSelfOutlineOnly);
 
     if (m_paintInfo.phase == PaintPhaseMask)
         return;
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         const auto* objectProperties = m_box.objectPaintProperties();
         if (objectProperties && objectProperties->overflowClip()) {
             PaintChunkProperties properties(paintInfo.context.getPaintController().currentPaintChunkProperties());
             properties.clip = objectProperties->overflowClip();
-            m_scopedClipProperty.emplace(paintInfo.context.getPaintController(), box, paintInfo.displayItemTypeForClipping(), properties);
+            m_scopedClipProperty.emplace(paintInfo.context.getPaintController(), properties);
         }
         return;
     }
 
     bool isControlClip = m_box.hasControlClip();
     bool isOverflowOrContainmentClip = (m_box.hasOverflowClip() || box.styleRef().containsPaint()) && !(m_box.hasLayer() && m_box.layer()->isSelfPaintingLayer());
 
     if (!isControlClip && !isOverflowOrContainmentClip)
         return;
 
@@ skipping 31 matching lines @@
 BoxClipper::~BoxClipper()
 {
     if (m_clipType == DisplayItem::UninitializedType)
         return;
 
     DCHECK(m_box.hasControlClip() || ((m_box.hasOverflowClip() || m_box.style()->containsPaint()) && !(m_box.hasLayer() && m_box.layer()->isSelfPaintingLayer())));
     m_paintInfo.context.getPaintController().endItem<EndClipDisplayItem>(m_box, DisplayItem::clipTypeToEndClipType(m_clipType));
 }
 
 } // namespace blink