third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h - Issue 1421423005: [css-flexbox] Fix min-size: auto for a non-auto flex basis

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.h

Issue 1421423005: [css-flexbox] Fix min-size: auto for a non-auto flex basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix tests Created 5 years, 2 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/LayoutTests/css3/flexbox/min-size-auto-expected.txt ('k') | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('j') | third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e1f5660a3741f239dff41b7558e218be22d153b4..661cd9a3529962a1aed647febf843bccf8329afc 100644

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

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

@@ -150,7 +150,7 @@ private:

LayoutUnit computeChildMarginValue(Length margin);

void prepareOrderIteratorAndMargins();

- LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child, LayoutUnit childSize, bool childShrunk = false);

+ LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child, LayoutUnit childSize);

// The hypothetical main size of an item is the flex base size clamped according to its min and max main size properties

bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren);