third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp - Issue 1651703002: More explicit LayoutUnit conversions

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 1651703002: More explicit LayoutUnit conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@evenMoarConstructors

Patch Set: Traits vs Properties vs Pandas 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/LayoutListBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.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 6130f6f234aa61ee6b83d2c3226e6d3ff3c81ac9..2b30f8fcc7599e548b2a544610dbd3ac81ae6b25 100644

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

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

@@ -480,7 +480,7 @@ void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(LayoutUnit& width

LayoutBlock* columnBlock = multiColumnBlockFlow();

const ComputedStyle* columnStyle = columnBlock->style();

LayoutUnit availableWidth = columnBlock->contentLogicalWidth();

- LayoutUnit columnGap = columnBlock->columnGap();

+ LayoutUnit columnGap = LayoutUnit(columnBlock->columnGap());

LayoutUnit computedColumnWidth = max(LayoutUnit(1), LayoutUnit(columnStyle->columnWidth()));

unsigned computedColumnCount = max<int>(1, columnStyle->columnCount());

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

const ComputedStyle* multicolStyle = multicolContainer->style();

int columnCount = multicolStyle->hasAutoColumnCount() ? 1 : multicolStyle->columnCount();

LayoutUnit columnWidth;

- LayoutUnit gapExtra = (columnCount - 1) * multicolContainer->columnGap();

+ LayoutUnit gapExtra = LayoutUnit((columnCount - 1) * multicolContainer->columnGap());

if (multicolStyle->hasAutoColumnWidth()) {

m_minPreferredLogicalWidth = m_minPreferredLogicalWidth * columnCount + gapExtra;

} else {

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutListBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »