| Index: Source/core/rendering/RenderFlexibleBox.h
|
| diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h
|
| index 828aef5962aacc719e1f51637c18e085c3e9e95e..b5cd5a78192f73ced82e06ab2c67a68417c6dd01 100644
|
| --- a/Source/core/rendering/RenderFlexibleBox.h
|
| +++ b/Source/core/rendering/RenderFlexibleBox.h
|
| @@ -84,10 +84,11 @@ private:
|
| RenderBox* next();
|
| void reset();
|
|
|
| + Vector<int> m_orderValues;
|
| +
|
| private:
|
| const RenderFlexibleBox* m_flexibleBox;
|
| RenderBox* m_currentChild;
|
| - Vector<int> m_orderValues;
|
| Vector<int>::const_iterator m_orderValuesIterator;
|
| };
|
|
|
| @@ -151,7 +152,7 @@ private:
|
| LayoutUnit marginBoxAscentForChild(RenderBox*);
|
|
|
| LayoutUnit computeChildMarginValue(Length margin, RenderView*);
|
| - void computeMainAxisPreferredSizes(Vector<int>&);
|
| + void prepareOrderIteratorAndMargins();
|
| LayoutUnit adjustChildSizeForMinAndMax(RenderBox*, LayoutUnit childSize);
|
| bool computeNextFlexLine(OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, double& totalFlexGrow, double& totalWeightedFlexShrink, LayoutUnit& minMaxAppliedMainAxisExtent, bool& hasInfiniteLineLength);
|
|
|
|
|