| Index: Source/core/paint/BoxClipper.cpp
|
| diff --git a/Source/core/paint/BoxClipper.cpp b/Source/core/paint/BoxClipper.cpp
|
| index e9ad1b3894cdccf3d4cbe5c71541fd723396a040..2fd97c62d32aa33a2079a34cae36d6919cca3121 100644
|
| --- a/Source/core/paint/BoxClipper.cpp
|
| +++ b/Source/core/paint/BoxClipper.cpp
|
| @@ -58,15 +58,16 @@ BoxClipper::BoxClipper(LayoutBox& box, const PaintInfo& paintInfo, const LayoutP
|
| 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());
|
| - } else {
|
| - clipDisplayItem->replay(*paintInfo.context);
|
| - }
|
| + ALLOW_UNUSED_LOCAL(m_clipType);
|
| + //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());
|
| + //} else {
|
| + // clipDisplayItem->replay(*paintInfo.context);
|
| + //}
|
|
|
| m_pushedClip = true;
|
| }
|
| @@ -78,19 +79,19 @@ BoxClipper::~BoxClipper()
|
|
|
| ASSERT(m_box.hasControlClip() || (m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer()));
|
|
|
| - DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipType);
|
| - if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| - ASSERT(m_paintInfo.context->displayItemList());
|
| - if (!m_paintInfo.context->displayItemList()->displayItemConstructionIsDisabled()) {
|
| - if (m_paintInfo.context->displayItemList()->lastDisplayItemIsNoopBegin())
|
| - m_paintInfo.context->displayItemList()->removeLastDisplayItem();
|
| - else
|
| - m_paintInfo.context->displayItemList()->add(EndClipDisplayItem::create(m_box, endType));
|
| - }
|
| - } else {
|
| - EndClipDisplayItem endClipDisplayItem(m_box, endType);
|
| - endClipDisplayItem.replay(*m_paintInfo.context);
|
| - }
|
| + //DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipType);
|
| + //if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| + // ASSERT(m_paintInfo.context->displayItemList());
|
| + // if (!m_paintInfo.context->displayItemList()->displayItemConstructionIsDisabled()) {
|
| + // if (m_paintInfo.context->displayItemList()->lastDisplayItemIsNoopBegin())
|
| + // m_paintInfo.context->displayItemList()->removeLastDisplayItem();
|
| + // else
|
| + // m_paintInfo.context->displayItemList()->add(EndClipDisplayItem::create(m_box, endType));
|
| + // }
|
| + //} else {
|
| + // EndClipDisplayItem endClipDisplayItem(m_box, endType);
|
| + // endClipDisplayItem.replay(*m_paintInfo.context);
|
| + //}
|
| }
|
|
|
| } // namespace blink
|
|
|