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

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

index b89db67ede2384ffed50007125da5b900a1c3ed2..33d90096ac510166caea24d724db83010000a380 100644

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

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

@@ -343,8 +343,8 @@ LayoutUnit LayoutMultiColumnSet::columnGap() const

{

LayoutBlockFlow* parentBlock = multiColumnBlockFlow();

if (parentBlock->style()->hasNormalColumnGap())

- return parentBlock->style()->fontDescription().computedPixelSize(); // "1em" is recommended as the normal gap setting. Matches <p> margins.

- return parentBlock->style()->columnGap();

+ return LayoutUnit(parentBlock->style()->fontDescription().computedPixelSize()); // "1em" is recommended as the normal gap setting. Matches <p> margins.

+ return LayoutUnit(parentBlock->style()->columnGap());

}

unsigned LayoutMultiColumnSet::actualColumnCount() const