Source/core/rendering/RenderBlock.cpp - Issue 179763003: [New multicol] Make -webkit-column-break-inside:avoid work.

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/RenderBlock.cpp

Issue 179763003: [New multicol] Make -webkit-column-break-inside:avoid work. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 10 months 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

« LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside.html ('K') | « LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlock.cpp

diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp

index 871d97aec96b0d3ee1f98998eca8c56623403f90..9dc25d8d0f9a95150157b89e15873d0fa9d37145 100644

--- a/Source/core/rendering/RenderBlock.cpp

+++ b/Source/core/rendering/RenderBlock.cpp

@@ -5174,7 +5174,7 @@ LayoutUnit RenderBlock::pageRemainingLogicalHeightForOffset(LayoutUnit offset, P

LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins)

{

- bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns();

+ bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns() || flowThreadContainingBlock();

bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->m_pageLogicalHeight;

bool isUnsplittable = child->isUnsplittableForPagination() || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID)

|| (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID);