Chromium Code Reviews| 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 96b647f5898b4b15ec3a8465ddd5439b7d768f75..7c1e48fdc70c52780048bbf55438f4e84cc6a191 100644 |
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
| @@ -70,6 +70,14 @@ public: |
| LayoutUnit childLogicalWidthForPercentageResolution(const LayoutBox& child); |
| void clearCachedMainSizeForChild(const LayoutBox& child); |
| + |
| + LayoutUnit staticMainAxisPositionForPositionedChild(const LayoutBox& child); |
| + LayoutUnit staticCrossAxisPositionForPositionedChild(const LayoutBox& child); |
| + |
| + LayoutUnit staticInlinePositionForPositionedChild(const LayoutBox& child); |
| + LayoutUnit staticBlockPositionForPositionedChild(const LayoutBox& child); |
| + |
|
eae
2016/04/25 02:37:28
Having a setter return a bool is a bit unusual. Yo
cbiesinger
2016/04/26 18:21:56
Done.
|
| + bool setStaticPositionForPositionedLayout(LayoutBox& child); |
| protected: |
| void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; |
| @@ -82,11 +90,6 @@ private: |
| NegativeFlexibility, |
| }; |
| - enum PositionedLayoutMode { |
| - FlipForRowReverse, |
| - NoFlipForRowReverse, |
| - }; |
| - |
| enum ChildLayoutType { |
| LayoutIfNeeded, |
| ForceLayout, |
| @@ -177,7 +180,7 @@ private: |
| void resetAutoMarginsAndLogicalTopInCrossAxis(LayoutBox& child); |
| void setOverrideMainAxisSizeForChild(LayoutBox& child, LayoutUnit childPreferredSize); |
| - void prepareChildForPositionedLayout(LayoutBox& child, LayoutUnit mainAxisOffset, LayoutUnit crossAxisOffset, PositionedLayoutMode); |
| + void prepareChildForPositionedLayout(LayoutBox& child); |
| size_t numberOfInFlowPositionedChildren(const OrderedFlexItemList&) const; |
| void layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, const OrderedFlexItemList&, const Vector<LayoutUnit, 16>& childSizes, LayoutUnit availableFreeSpace, bool relayoutChildren, SubtreeLayoutScope&, Vector<LineContext>&); |
| void layoutColumnReverse(const OrderedFlexItemList&, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace); |