third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.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/LayoutMultiColumnFlowThread.cpp

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

Patch Set: Fix additional test 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMeter.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp » ('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 2b30f8fcc7599e548b2a544610dbd3ac81ae6b25..cc04c00db8e6b756d1ace3ef12bb78a19a4dfe4f 100644

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

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

@@ -862,7 +862,7 @@ void LayoutMultiColumnFlowThread::computePreferredLogicalWidths()

if (multicolStyle->hasAutoColumnWidth()) {

m_minPreferredLogicalWidth = m_minPreferredLogicalWidth * columnCount + gapExtra;

} else {

- columnWidth = multicolStyle->columnWidth();

+ columnWidth = LayoutUnit(multicolStyle->columnWidth());

m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, columnWidth);

}

// Note that if column-count is auto here, we should resolve it to calculate the maximum