third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp - Issue 1461923005: When balancing columns, we must check inner multicols for unbreakable content.

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/layout/LayoutMultiColumnFlowThread.cpp

Issue 1461923005: When balancing columns, we must check inner multicols for unbreakable content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« third_party/WebKit/Source/core/layout/ColumnBalancer.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

index 5e2ad6fef5f3b5a28a6fc65e6bd169ff462e8094..fc7e68b10ea14441ebadd74d365f89ff1cb85ac4 100644

--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

@@ -262,6 +262,13 @@ void LayoutMultiColumnFlowThread::evacuateAndDestroy()

destroy();

}

+LayoutUnit LayoutMultiColumnFlowThread::tallestUnbreakableLogicalHeight(LayoutUnit offsetInFlowThread) const

+ if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offsetInFlowThread))

+ return multicolSet->tallestUnbreakableLogicalHeight();

+ return LayoutUnit();

LayoutSize LayoutMultiColumnFlowThread::columnOffset(const LayoutPoint& point) const

{

if (!hasValidColumnSetInfo())