Index: Source/core/layout/LayoutFlexibleBox.h |
diff --git a/Source/core/layout/LayoutFlexibleBox.h b/Source/core/layout/LayoutFlexibleBox.h |
index 4b3fd8be7b015faf818f281364f35c7ae1996398..ac815f700638a7c3158d07221fa110e6c04edebd 100644 |
--- a/Source/core/layout/LayoutFlexibleBox.h |
+++ b/Source/core/layout/LayoutFlexibleBox.h |
@@ -91,6 +91,7 @@ private: |
bool isLeftToRightFlow() const; |
bool isMultiline() const; |
Length flexBasisForChild(LayoutBox& child) const; |
+ bool percentageMainSizeIsResolvable(); |
LayoutUnit crossAxisExtentForChild(LayoutBox& child) const; |
LayoutUnit crossAxisIntrinsicExtentForChild(LayoutBox& child) const; |
LayoutUnit childIntrinsicHeight(LayoutBox& child) const; |
@@ -125,6 +126,7 @@ private: |
LayoutUnit preferredMainAxisContentExtentForChild(LayoutBox& child, bool hasInfiniteLineLength, bool relayoutChildren = false); |
bool childPreferredMainAxisContentExtentRequiresLayout(LayoutBox& child, bool hasInfiniteLineLength) const; |
bool needToStretchChildLogicalHeight(LayoutBox& child) const; |
+ EOverflow mainAxisOverflowForChild(LayoutBox& child) const; |
void layoutFlexItems(bool relayoutChildren); |
LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit& availableFreeSpace); |
@@ -141,7 +143,7 @@ private: |
LayoutUnit computeChildMarginValue(Length margin); |
void prepareOrderIteratorAndMargins(); |
- LayoutUnit adjustChildSizeForMinAndMax(LayoutBox& child, LayoutUnit childSize); |
+ LayoutUnit adjustChildSizeForMinAndMax(LayoutBox& child, LayoutUnit childSize, bool hasInfiniteLineLength); |
// 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& hasInfiniteLineLength, bool relayoutChildren); |