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 d907bb772451ecb47cf91cdfc4ad7d28f72833d5..0d36bee196f24831290857045453d175c51243a2 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
@@ -59,6 +59,7 @@ public: |
void paintChildren(const PaintInfo&, const LayoutPoint&) const final; |
bool isHorizontalFlow() const; |
+ virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&) {return nullptr;}; |
const OrderIterator& orderIterator() const { return m_orderIterator; } |
@@ -175,7 +176,7 @@ private: |
LayoutUnit adjustChildSizeForMinAndMax(const LayoutBox& child, LayoutUnit childSize); |
LayoutUnit adjustChildSizeForAspectRatioCrossAxisMinAndMax(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& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren); |
+ bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren, SubtreeLayoutScope&); |
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); |