Source/core/rendering/RenderBox.cpp - Issue 111263002: Merge 163220 "Should paint border before background when bleedAv..."

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: Source/core/rendering/RenderBox.cpp

Issue 111263002: Merge 163220 "Should paint border before background when bleedAv..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1700/

Patch Set: Created 7 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/platform/linux/fast/table/table-with-border-radius-expected.png ('k') | Source/core/rendering/RenderTable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBox.cpp

===================================================================

--- Source/core/rendering/RenderBox.cpp (revision 163485)

+++ Source/core/rendering/RenderBox.cpp (working copy)

@@ -1340,7 +1340,7 @@

paintBoxShadow(paintInfo, paintRect, style(), Inset);

// The theme will tell us whether or not we should also paint the CSS border.

- if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasAppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style()->hasBorder())

+ if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style()->hasAppearance() || (!themePainted && RenderTheme::theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style()->hasBorder() && !(isTable() && toRenderTable(this)->collapseBorders()))

paintBorder(paintInfo, paintRect, style(), bleedAvoidance);

}

« no previous file with comments | « LayoutTests/platform/linux/fast/table/table-with-border-radius-expected.png ('k') | Source/core/rendering/RenderTable.h » ('j') | no next file with comments »