| 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 8f27a2533dbf72cfa5341ae96069d98db7f72975..e247165139453a2e65094d8611c2a30f72f19167 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
|
| @@ -145,9 +145,9 @@ private:
|
| bool useChildAspectRatio(const LayoutBox& child) const;
|
| LayoutUnit computeMainSizeFromAspectRatioUsing(const LayoutBox& child, Length crossSizeLength) const;
|
| void setFlowAwareLocationForChild(LayoutBox& child, const LayoutPoint&);
|
| + LayoutUnit computeInnerFlexBaseSizeForChild(LayoutBox& child, LayoutUnit mainAxisBorderAndPadding, ChildLayoutType = LayoutIfNeeded);
|
| void adjustAlignmentForChild(LayoutBox& child, LayoutUnit);
|
| ItemPosition alignmentForChild(const LayoutBox& child) const;
|
| - LayoutUnit computeInnerFlexBaseSizeForChild(LayoutBox& child, LayoutUnit mainAxisBorderAndPadding, ChildLayoutType = LayoutIfNeeded);
|
| bool mainAxisLengthIsDefinite(const LayoutBox& child, const Length& flexBasis) const;
|
| bool crossAxisLengthIsDefinite(const LayoutBox& child, const Length& flexBasis) const;
|
| bool childFlexBaseSizeRequiresLayout(const LayoutBox& child) const;
|
|
|