third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp - Issue 1656743002: Removing more implicit LayoutUnit construction

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

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

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

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

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

index bf01933fbd920b1e3e9d4a1bc5e8bf9a91cb491c..5f80a52b32a94f8184901ffd5daea61c211e863b 100644

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

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

@@ -304,7 +304,7 @@ LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const

LayoutUnit availableHeight = flowThread->columnHeightAvailable();

LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutUnit::max();

if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {

- LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), -1);

+ LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), LayoutUnit(-1));

if (logicalMaxHeight != -1 && maxColumnHeight > logicalMaxHeight)

maxColumnHeight = logicalMaxHeight;

}