Index: Source/core/paint/BoxClipper.cpp |
diff --git a/Source/core/paint/BoxClipper.cpp b/Source/core/paint/BoxClipper.cpp |
index f1d83cc246d23b0c02a73768ba4c4c153728c1a8..591bf743153dd2c409cb549c9bb09b0090835cbb 100644 |
--- a/Source/core/paint/BoxClipper.cpp |
+++ b/Source/core/paint/BoxClipper.cpp |
@@ -24,7 +24,7 @@ BoxClipper::BoxClipper(const LayoutBox& box, const PaintInfo& paintInfo, const L |
return; |
bool isControlClip = m_box.hasControlClip(); |
- bool isOverflowClip = m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer(); |
+ bool isOverflowClip = m_box.hasOverflowClip() && (!m_box.layer()->isSelfPaintingLayer() || RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
chrishtr
2015/09/17 18:07:53
Why this change?
|
if (!isControlClip && !isOverflowClip) |
return; |
@@ -35,7 +35,7 @@ BoxClipper::BoxClipper(const LayoutBox& box, const PaintInfo& paintInfo, const L |
if (hasBorderRadius) |
clipRoundedRect = m_box.style()->getRoundedInnerBorderFor(LayoutRect(accumulatedOffset, m_box.size())); |
- if (contentsClipBehavior == SkipContentsClipIfPossible) { |
+ if (contentsClipBehavior == SkipContentsClipIfPossible && !RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
chrishtr
2015/09/17 18:07:53
Is this change because we want to preserve clips i
|
LayoutRect contentsVisualOverflow = m_box.contentsVisualOverflowRect(); |
if (contentsVisualOverflow.isEmpty()) |
return; |
@@ -65,7 +65,7 @@ BoxClipper::~BoxClipper() |
if (m_clipType == DisplayItem::UninitializedType) |
return; |
- ASSERT(m_box.hasControlClip() || (m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer())); |
+ ASSERT(m_box.hasControlClip() || (m_box.hasOverflowClip() && (!m_box.layer()->isSelfPaintingLayer() || RuntimeEnabledFeatures::slimmingPaintV2Enabled()))); |
ASSERT(m_paintInfo.context->displayItemList()); |
if (!m_paintInfo.context->displayItemList()->displayItemConstructionIsDisabled()) { |
if (m_paintInfo.context->displayItemList()->lastDisplayItemIsNoopBegin()) |