third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp - Issue 1472053002: Jump to the next outer column when an inner column is too short.

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

Issue 1472053002: Jump to the next outer column when an inner column is too short. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: code review 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlowThread.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/LayoutFlowThread.cpp

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

index f0ffeb098c9605dddbf1eadb8632cbd5b48419a1..627d9f5b9496f5e557bedade1d377b81203e7300 100644

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

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

@@ -163,6 +163,14 @@ void LayoutFlowThread::generateColumnSetIntervalTree()

m_multiColumnSetIntervalTree.add(MultiColumnSetIntervalTree::createInterval(columnSet->logicalTopInFlowThread(), columnSet->logicalBottomInFlowThread(), columnSet));

}

+LayoutUnit LayoutFlowThread::nextLogicalTopForUnbreakableContent(LayoutUnit flowThreadOffset, LayoutUnit contentLogicalHeight) const

+ LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(flowThreadOffset);

+ if (!columnSet)

+ return flowThreadOffset;

+ return columnSet->nextLogicalTopForUnbreakableContent(flowThreadOffset, contentLogicalHeight);

void LayoutFlowThread::collectLayerFragments(PaintLayerFragments& layerFragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRectInFlowThread)

{

ASSERT(!m_columnSetsInvalidated);