third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp - Issue 2261663002: Disallow cast/implicit conversion from LayoutUnit to int/unsigned

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 2261663002: Disallow cast/implicit conversion from LayoutUnit to int/unsigned (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: - Created 4 years, 4 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/LayoutListMarker.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.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 f5ffc24d23a67de54242fc8159fadfca3ca86669..b08511ec80b14f00f6dfa5215a333b1fb883f4f1 100644

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

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

@@ -585,10 +585,10 @@ void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(LayoutUnit& width

count = computedColumnCount;

width = ((availableWidth - ((count - 1) * columnGap)) / count).clampNegativeToZero();

} else if (!columnStyle->hasAutoColumnWidth() && columnStyle->hasAutoColumnCount()) {

- count = std::max(LayoutUnit(1), (availableWidth + columnGap) / (computedColumnWidth + columnGap));

+ count = std::max(LayoutUnit(1), (availableWidth + columnGap) / (computedColumnWidth + columnGap)).toUnsigned();

width = ((availableWidth + columnGap) / count) - columnGap;

} else {

- count = std::max(std::min(LayoutUnit(computedColumnCount), (availableWidth + columnGap) / (computedColumnWidth + columnGap)), LayoutUnit(1));

+ count = std::max(std::min(LayoutUnit(computedColumnCount), (availableWidth + columnGap) / (computedColumnWidth + columnGap)), LayoutUnit(1)).toUnsigned();

width = ((availableWidth + columnGap) / count) - columnGap;

}