Index: Source/core/rendering/RenderFlexibleBox.cpp |
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp |
index 71cf04a3b368ab1f2f0d151c8e07230c948675bf..585a0c9c2f102b1c27cd0d5e2ace817fbe09a960 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.cpp |
+++ b/Source/core/rendering/RenderFlexibleBox.cpp |
@@ -959,13 +959,13 @@ bool RenderFlexibleBox::resolveFlexibleLengths(FlexSign flexSign, const OrderedF |
return !totalViolation; |
} |
-static LayoutUnit initialJustifyContentOffset(LayoutUnit availableFreeSpace, EJustifyContent justifyContent, unsigned numberOfChildren) |
+static LayoutUnit initialJustifyContentOffset(LayoutUnit availableFreeSpace, ContentPosition justifyContent, ContentDistributionType justifyContentDistribution, unsigned numberOfChildren) |
{ |
- if (justifyContent == JustifyFlexEnd) |
+ if (justifyContent == ContentPositionFlexEnd) |
return availableFreeSpace; |
- if (justifyContent == JustifyCenter) |
+ if (justifyContent == ContentPositionCenter) |
return availableFreeSpace / 2; |
- if (justifyContent == JustifySpaceAround) { |
+ if (justifyContentDistribution == ContentDistributionSpaceAround) { |
if (availableFreeSpace > 0 && numberOfChildren) |
return availableFreeSpace / (2 * numberOfChildren); |
else |
@@ -974,12 +974,12 @@ static LayoutUnit initialJustifyContentOffset(LayoutUnit availableFreeSpace, EJu |
return 0; |
} |
-static LayoutUnit justifyContentSpaceBetweenChildren(LayoutUnit availableFreeSpace, EJustifyContent justifyContent, unsigned numberOfChildren) |
+static LayoutUnit justifyContentSpaceBetweenChildren(LayoutUnit availableFreeSpace, ContentDistributionType justifyContentDistribution, unsigned numberOfChildren) |
{ |
if (availableFreeSpace > 0 && numberOfChildren > 1) { |
- if (justifyContent == JustifySpaceBetween) |
+ if (justifyContentDistribution == ContentDistributionSpaceBetween) |
return availableFreeSpace / (numberOfChildren - 1); |
- if (justifyContent == JustifySpaceAround) |
+ if (justifyContentDistribution == ContentDistributionSpaceAround) |
return availableFreeSpace / numberOfChildren; |
} |
return 0; |
@@ -1080,7 +1080,7 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons |
size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children); |
LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace); |
LayoutUnit mainAxisOffset = flowAwareBorderStart() + flowAwarePaddingStart(); |
- mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), numberOfChildrenForJustifyContent); |
+ mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent); |
if (style()->flexDirection() == FlowRowReverse) |
mainAxisOffset += isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight(); |
@@ -1145,7 +1145,7 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons |
++seenInFlowPositionedChildren; |
if (seenInFlowPositionedChildren < numberOfChildrenForJustifyContent) |
- mainAxisOffset += justifyContentSpaceBetweenChildren(availableFreeSpace, style()->justifyContent(), numberOfChildrenForJustifyContent); |
+ mainAxisOffset += justifyContentSpaceBetweenChildren(availableFreeSpace, style()->justifyContentDistribution(), numberOfChildrenForJustifyContent); |
} |
if (isColumnFlow()) |
@@ -1171,7 +1171,7 @@ void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, |
// just moving the children to a new position. |
size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children); |
LayoutUnit mainAxisOffset = logicalHeight() - flowAwareBorderEnd() - flowAwarePaddingEnd(); |
- mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), numberOfChildrenForJustifyContent); |
+ mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, style()->justifyContent(), style()->justifyContentDistribution(), numberOfChildrenForJustifyContent); |
mainAxisOffset -= isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight(); |
size_t seenInFlowPositionedChildren = 0; |
@@ -1190,7 +1190,7 @@ void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, |
++seenInFlowPositionedChildren; |
if (seenInFlowPositionedChildren < numberOfChildrenForJustifyContent) |
- mainAxisOffset -= justifyContentSpaceBetweenChildren(availableFreeSpace, style()->justifyContent(), numberOfChildrenForJustifyContent); |
+ mainAxisOffset -= justifyContentSpaceBetweenChildren(availableFreeSpace, style()->justifyContentDistribution(), numberOfChildrenForJustifyContent); |
} |
} |