| 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 a8bcedcf0774909d78c3aa2a6ab3317499cd2fb4..905efe65d465dee8119197dc754cca831a0d28d5 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
|
| @@ -172,7 +172,8 @@ private:
|
| // 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& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren);
|
|
|
| - bool resolveFlexibleLengths(FlexSign, OrderedFlexItemList&, LayoutUnit availableFreeSpace, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
|
| + void freezeInflexibleItems(FlexSign, OrderedFlexItemList& children, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
|
| + bool resolveFlexibleLengths(FlexSign, OrderedFlexItemList&, LayoutUnit initialFreeSpace, LayoutUnit& remainingFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
|
| void freezeViolations(Vector<FlexItem*>&, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink);
|
|
|
| void resetAutoMarginsAndLogicalTopInCrossAxis(LayoutBox& child);
|
|
|