third_party/WebKit/Source/core/layout/LayoutFlexibleBox.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/LayoutFlexibleBox.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/LayoutFileUploadControl.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFlowThread.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fc74235e21960b1f908e4532c7e69e6ce9a19d04..88a1e787f0d28afdeafb175d963182d4c0b6263a 100644

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

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

@@ -1416,7 +1416,7 @@ void LayoutFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children,

static LayoutUnit initialAlignContentOffset(LayoutUnit availableFreeSpace, ContentPosition alignContent, ContentDistributionType alignContentDistribution, unsigned numberOfLines)

{

if (numberOfLines <= 1)

- return 0;

+ return LayoutUnit();

if (alignContent == ContentPositionFlexEnd)

return availableFreeSpace;

if (alignContent == ContentPositionCenter)

@@ -1427,7 +1427,7 @@ static LayoutUnit initialAlignContentOffset(LayoutUnit availableFreeSpace, Conte

if (availableFreeSpace < 0)

return availableFreeSpace / 2;

}

- return 0;

+ return LayoutUnit();

}

static LayoutUnit alignContentSpaceBetweenChildren(LayoutUnit availableFreeSpace, ContentDistributionType alignContentDistribution, unsigned numberOfLines)

@@ -1438,7 +1438,7 @@ static LayoutUnit alignContentSpaceBetweenChildren(LayoutUnit availableFreeSpace

if (alignContentDistribution == ContentDistributionSpaceAround || alignContentDistribution == ContentDistributionStretch)

return availableFreeSpace / numberOfLines;

}

- return 0;

+ return LayoutUnit();

}

void LayoutFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)