| Index: Source/core/layout/LayoutFlexibleBox.h
|
| diff --git a/Source/core/layout/LayoutFlexibleBox.h b/Source/core/layout/LayoutFlexibleBox.h
|
| index 29246be4db07896c084c247f080c72e76e7199d0..985afdce252b3a2aa5d3ae7513958a95700f7e17 100644
|
| --- a/Source/core/layout/LayoutFlexibleBox.h
|
| +++ b/Source/core/layout/LayoutFlexibleBox.h
|
| @@ -144,7 +144,7 @@ private:
|
|
|
| LayoutUnit computeChildMarginValue(Length margin);
|
| void prepareOrderIteratorAndMargins();
|
| - LayoutUnit adjustChildSizeForMinAndMax(LayoutBox& child, LayoutUnit childSize);
|
| + LayoutUnit adjustChildSizeForMinAndMax(LayoutBox& child, LayoutUnit childSize, bool childShrunk = false);
|
| // 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);
|
|
|
|
|