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 9ea7c0128a9b31a5837e9c151d3ba7b4c257929d..d907bb772451ecb47cf91cdfc4ad7d28f72833d5 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h |
@@ -120,6 +120,7 @@ private: |
LayoutUnit childIntrinsicHeight(const LayoutBox& child) const; |
LayoutUnit childIntrinsicWidth(const LayoutBox& child) const; |
LayoutUnit mainAxisExtentForChild(const LayoutBox& child) const; |
+ LayoutUnit mainAxisContentExtentForChild(const LayoutBox& child) const; |
LayoutUnit crossAxisExtent() const; |
LayoutUnit mainAxisExtent() const; |
LayoutUnit crossAxisContentExtent() const; |
@@ -181,7 +182,7 @@ private: |
void freezeViolations(Vector<FlexItem*>&, LayoutUnit& availableFreeSpace, double& totalFlexGrow, double& totalFlexShrink, double& totalWeightedFlexShrink); |
void resetAutoMarginsAndLogicalTopInCrossAxis(LayoutBox& child); |
- void setOverrideMainAxisSizeForChild(LayoutBox& child, LayoutUnit childPreferredSize); |
+ void setOverrideMainAxisContentSizeForChild(LayoutBox& child, LayoutUnit childPreferredSize); |
void prepareChildForPositionedLayout(LayoutBox& child); |
size_t numberOfInFlowPositionedChildren(const OrderedFlexItemList&) const; |
void layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, const OrderedFlexItemList&, LayoutUnit availableFreeSpace, bool relayoutChildren, SubtreeLayoutScope&, Vector<LineContext>&); |