third_party/WebKit/Source/core/layout/LayoutBlock.h - 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/LayoutBlock.h

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: Reduce diff - early return so that we can revert some indentation changes 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/LayoutTests/fast/multicol/nested-short-first-row-unsplittable-block-expected.txt ('k') | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBlock.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h

index 729dbacfe318dfa13d7b862aadf2eefb19b8590e..d0e54aeba07150cfdeac9ed219b9e472791b3b9e 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBlock.h

+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h

@@ -436,6 +436,12 @@ public:

LayoutUnit pageLogicalHeightForOffset(LayoutUnit) const;

LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit, PageBoundaryRule) const;

+ // Calculate the strut to insert in order fit content of size |contentLogicalHeight|.

+ // |strutToNextPage| is the strut to add to |offset| to merely get to the top of the next page

+ // or column. This is what will be returned if the content can actually fit there. Otherwise,

+ // return the distance to the next fragmentainer that can fit this piece of content.

+ LayoutUnit calculatePaginationStrutToFitContent(LayoutUnit offset, LayoutUnit strutToNextPage, LayoutUnit contentLogicalHeight) const;

protected:

bool isPageLogicalHeightKnown(LayoutUnit logicalOffset) const { return pageLogicalHeightForOffset(logicalOffset); }