Source/core/rendering/RenderMultiColumnSet.cpp - Issue 688703003: [New Multicolumn] Add RenderMultiColumnSpannerSet.

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

Issue 688703003: [New Multicolumn] Add RenderMultiColumnSpannerSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

« Source/core/rendering/RenderMultiColumnFlowThreadTest.cpp ('K') | « Source/core/rendering/RenderMultiColumnSet.h ('k') | Source/core/rendering/RenderMultiColumnSpannerSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderMultiColumnSet.cpp

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

index efb34c280b22c0ba73502a33796ec30e7e58f589..f2451de20aa11709dfab46211f224c4a2514395a 100644

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

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

@@ -206,6 +206,12 @@ void RenderMultiColumnSet::addContentRun(LayoutUnit endOffsetFromFirstPage)

bool RenderMultiColumnSet::recalculateColumnHeight(BalancedHeightCalculation calculationMode)

{

+ if (previousSiblingMultiColumnSet()) {

+ // FIXME: column spanner layout is not yet implemented. Until it's in place, we only operate

+ // on the first set during layout. We need to ignore the others here, or assertions will

+ // fail.

+ return false;

+ }

ASSERT(multiColumnFlowThread()->heightIsAuto());

LayoutUnit oldColumnHeight = m_columnHeight;