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 18c35849761bf19c2efca008a6d4a3045cd218b9..d736ddfb2a445d682de38cc26a36f25f48bed6a8 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
@@ -59,7 +59,6 @@ |
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; } |
@@ -176,7 +175,7 @@ |
LayoutUnit adjustChildSizeForAspectRatioCrossAxisMinAndMax(const LayoutBox& child, LayoutUnit childSize); |
FlexItem constructFlexItem(LayoutBox& child, ChildLayoutType); |
// 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, LayoutObject* childToExclude); |
+ bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& sumFlexBaseSize, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink, LayoutUnit& sumHypotheticalMainSize, bool relayoutChildren); |
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); |