third_party/WebKit/Source/core/paint/BoxClipper.cpp - Issue 1490063002: Implement Paint Containment

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/BoxClipper.cpp

Issue 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove unnecessary adjustStyleForContainment declaration Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/core/paint/BoxClipper.cpp

diff --git a/third_party/WebKit/Source/core/paint/BoxClipper.cpp b/third_party/WebKit/Source/core/paint/BoxClipper.cpp

index 6355078338ba7f8605031ba53decf96cabb74ae5..516ffd3623e7f5ec268b6c5cbe4013da15ae3c16 100644

--- a/third_party/WebKit/Source/core/paint/BoxClipper.cpp

+++ b/third_party/WebKit/Source/core/paint/BoxClipper.cpp

@@ -24,9 +24,10 @@ 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 isOverflowOrContainmentClip = (m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer())

+ || m_box.style()->containsPaint();

- if (!isControlClip && !isOverflowClip)

+ if (!isControlClip && !isOverflowOrContainmentClip)

return;

LayoutRect clipRect = isControlClip ? m_box.controlClipRect(accumulatedOffset) : m_box.overflowClipRect(accumulatedOffset);

@@ -64,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()) || m_box.style()->containsPaint());

m_paintInfo.context->paintController().endItem<EndClipDisplayItem>(m_box, DisplayItem::clipTypeToEndClipType(m_clipType));

}