| Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| index ab56f2621aa36c3438e3d5b232ce78e7bf420ebe..9cce0748c978896afd8a5e1075997e55651594c8 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
|
| @@ -897,8 +897,9 @@ LayoutUnit LayoutFlexibleBox::computeInnerFlexBaseSizeForChild(
|
|
|
| Length flexBasis = flexBasisForChild(child);
|
| if (mainAxisLengthIsDefinite(child, flexBasis))
|
| - return std::max(LayoutUnit(), computeMainAxisExtentForChild(
|
| - child, MainOrPreferredSize, flexBasis));
|
| + return std::max(
|
| + LayoutUnit(),
|
| + computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis));
|
|
|
| if (child.styleRef().containsSize())
|
| return LayoutUnit();
|
| @@ -1863,9 +1864,10 @@ void LayoutFlexibleBox::layoutAndPlaceChildren(
|
| }
|
|
|
| if (isColumnFlow())
|
| - setLogicalHeight(std::max(
|
| - logicalHeight(), mainAxisOffset + flowAwareBorderEnd() +
|
| - flowAwarePaddingEnd() + scrollbarLogicalHeight()));
|
| + setLogicalHeight(std::max(logicalHeight(),
|
| + mainAxisOffset + flowAwareBorderEnd() +
|
| + flowAwarePaddingEnd() +
|
| + scrollbarLogicalHeight()));
|
|
|
| if (style()->flexDirection() == FlowColumnReverse) {
|
| // We have to do an extra pass for column-reverse to reposition the flex
|
| @@ -2004,8 +2006,9 @@ void LayoutFlexibleBox::adjustAlignmentForChild(LayoutBox& child,
|
| LayoutUnit delta) {
|
| DCHECK(!child.isOutOfFlowPositioned());
|
|
|
| - setFlowAwareLocationForChild(child, flowAwareLocationForChild(child) +
|
| - LayoutSize(LayoutUnit(), delta));
|
| + setFlowAwareLocationForChild(
|
| + child,
|
| + flowAwareLocationForChild(child) + LayoutSize(LayoutUnit(), delta));
|
| }
|
|
|
| void LayoutFlexibleBox::alignChildren(const Vector<LineContext>& lineContexts) {
|
| @@ -2027,8 +2030,9 @@ void LayoutFlexibleBox::alignChildren(const Vector<LineContext>& lineContexts) {
|
|
|
| if (updateAutoMarginsInCrossAxis(
|
| *flexItem.box,
|
| - std::max(LayoutUnit(), availableAlignmentSpaceForChild(
|
| - lineCrossAxisExtent, *flexItem.box))))
|
| + std::max(LayoutUnit(),
|
| + availableAlignmentSpaceForChild(lineCrossAxisExtent,
|
| + *flexItem.box))))
|
| continue;
|
|
|
| ItemPosition position = alignmentForChild(*flexItem.box);
|
| @@ -2042,10 +2046,11 @@ void LayoutFlexibleBox::alignChildren(const Vector<LineContext>& lineContexts) {
|
| adjustAlignmentForChild(*flexItem.box, offset);
|
| if (position == ItemPositionBaseline &&
|
| styleRef().flexWrap() == FlexWrapReverse) {
|
| - minMarginAfterBaseline = std::min(
|
| - minMarginAfterBaseline, availableAlignmentSpaceForChild(
|
| - lineCrossAxisExtent, *flexItem.box) -
|
| - offset);
|
| + minMarginAfterBaseline =
|
| + std::min(minMarginAfterBaseline,
|
| + availableAlignmentSpaceForChild(lineCrossAxisExtent,
|
| + *flexItem.box) -
|
| + offset);
|
| }
|
| }
|
| minMarginAfterBaselines.push_back(minMarginAfterBaseline);
|
|
|