| Index: Source/core/paint/BoxClipper.cpp
|
| diff --git a/Source/core/paint/BoxClipper.cpp b/Source/core/paint/BoxClipper.cpp
|
| index ce1de5652c9232df953bec572020b00fd471b139..ab8c1578dd6258f1b296ce4d2852ca22e5bba215 100644
|
| --- a/Source/core/paint/BoxClipper.cpp
|
| +++ b/Source/core/paint/BoxClipper.cpp
|
| @@ -52,14 +52,15 @@ BoxClipper::BoxClipper(LayoutBox& box, const PaintInfo& paintInfo, const LayoutP
|
| return;
|
| }
|
|
|
| - if (RuntimeEnabledFeatures::slimmingPaintEnabled())
|
| - m_clipType = m_paintInfo.displayItemTypeForClipping();
|
| -
|
| - OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(m_box, m_clipType, pixelSnappedIntRect(clipRect));
|
| - if (hasBorderRadius)
|
| - clipDisplayItem->roundedRectClips().append(clipRoundedRect);
|
| + OwnPtr<Vector<FloatRoundedRect>> roundedRects;
|
| + if (hasBorderRadius) {
|
| + roundedRects = adoptPtr(new Vector<FloatRoundedRect>());
|
| + roundedRects->append(clipRoundedRect);
|
| + }
|
|
|
| + OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(m_box, m_clipType, pixelSnappedIntRect(clipRect), roundedRects.release());
|
| if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| + m_clipType = m_paintInfo.displayItemTypeForClipping();
|
| ASSERT(m_paintInfo.context->displayItemList());
|
| if (!m_paintInfo.context->displayItemList()->displayItemConstructionIsDisabled())
|
| m_paintInfo.context->displayItemList()->add(clipDisplayItem.release());
|
|
|