Blink-side contiguous allocation of display items.

Source/core/paint/LayerClipRecorder.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 "config.h"
 #include "core/paint/LayerClipRecorder.h"
 
 #include "core/layout/ClipRect.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 
 namespace blink {
 
 LayerClipRecorder::LayerClipRecorder(GraphicsContext& graphicsContext, const LayoutBoxModelObject& layoutObject, DisplayItem::Type clipType, const ClipRect& clipRect,
     const DeprecatedPaintLayerPaintingInfo* localPaintingInfo, const LayoutPoint& fragmentOffset, PaintLayerFlags paintFlags, BorderRadiusClippingRule rule)
     : m_graphicsContext(graphicsContext)
     , m_layoutObject(layoutObject)
     , m_clipType(clipType)
 {
     IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect());
-    OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(layoutObject, clipType, snappedClipRect);
-    if (localPaintingInfo && clipRect.hasRadius())
-        collectRoundedRectClips(*layoutObject.layer(), *localPaintingInfo, graphicsContext, fragmentOffset, paintFlags, rule, clipDisplayItem->roundedRectClips());
+    OwnPtr<Vector<FloatRoundedRect>> roundedRectClips;
+    if (localPaintingInfo && clipRect.hasRadius()) {
+        roundedRectClips = adoptPtr(new Vector<FloatRoundedRect>());
+        collectRoundedRectClips(*layoutObject.layer(), *localPaintingInfo, graphicsContext, fragmentOffset, paintFlags, rule, *roundedRectClips);
+    }
     if (!RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        clipDisplayItem->replay(graphicsContext);
+        ClipDisplayItem clipDisplayItem(layoutObject, clipType, snappedClipRect, roundedRectClips.release());
+        clipDisplayItem.replay(graphicsContext);
     } else {
         ASSERT(m_graphicsContext.displayItemList());
         if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
             return;
-        m_graphicsContext.displayItemList()->add(clipDisplayItem.release());
+        m_graphicsContext.displayItemList()->createAndAppendIfNeeded<ClipDisplayItem>(layoutObject, clipType, snappedClipRect, roundedRectClips.release());
     }
 }
 
 static bool inContainingBlockChain(DeprecatedPaintLayer* startLayer, DeprecatedPaintLayer* endLayer)
 {
     if (startLayer == endLayer)
         return true;
 
     LayoutView* view = startLayer->layoutObject()->view();
     for (LayoutBlock* currentBlock = startLayer->layoutObject()->containingBlock(); currentBlock && currentBlock != view; currentBlock = currentBlock->containingBlock()) {
@@ skipping 29 matching lines @@
     }
 }
 
 LayerClipRecorder::~LayerClipRecorder()
 {
     if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
         ASSERT(m_graphicsContext.displayItemList());
         if (m_graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
             return;
         DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipType);
-        OwnPtr<EndClipDisplayItem> endClip = EndClipDisplayItem::create(m_layoutObject, endType);
-        m_graphicsContext.displayItemList()->add(endClip.release());
+        m_graphicsContext.displayItemList()->createAndAppendIfNeeded<EndClipDisplayItem>(m_layoutObject, endType);
     } else {
         m_graphicsContext.restore();
     }
 }
 
 } // namespace blink