Modified: trunk/Source/WebCore/ChangeLog (197508 => 197509)
--- trunk/Source/WebCore/ChangeLog 2016-03-03 17:28:27 UTC (rev 197508)
+++ trunk/Source/WebCore/ChangeLog 2016-03-03 17:40:57 UTC (rev 197509)
@@ -1,3 +1,11 @@
+2016-03-03 Alexey Proskuryakov <a...@apple.com>
+
+ AllInOne build fix.
+
+ * rendering/RenderFlexibleBox.cpp:
+ * rendering/RenderGrid.cpp:
+ Don't have two static functions with the same name.
+
2016-03-03 Chris Dumez <cdu...@apple.com>
Drop [TreatNullAs=EmptyString] from URL interface attributes
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (197508 => 197509)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-03-03 17:28:27 UTC (rev 197508)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-03-03 17:40:57 UTC (rev 197509)
@@ -1092,7 +1092,7 @@
return child.style().overflowY();
}
-static const StyleContentAlignmentData& normalValueBehavior()
+static const StyleContentAlignmentData& normalValueBehaviorFlexibleBox()
{
// The justify-content property applies along the main axis, but since flexing
// in the main axis is controlled by flex, stretch behaves as flex-start (ignoring
@@ -1106,8 +1106,8 @@
{
ASSERT(childSizes.size() == children.size());
- ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehaviorFlexibleBox());
size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);
LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace);
@@ -1190,8 +1190,8 @@
void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace)
{
- ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehaviorFlexibleBox());
// This is similar to the logic in layoutAndPlaceChildren, except we place the children
// starting from the end of the flexbox. We also don't need to layout anything since we're
@@ -1248,8 +1248,8 @@
void RenderFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)
{
- ContentPosition position = style().resolvedAlignContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedAlignContentDistribution(normalValueBehavior());
+ ContentPosition position = style().resolvedAlignContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedAlignContentDistribution(normalValueBehaviorFlexibleBox());
if (!isMultiline() || position == ContentPositionFlexStart)
return;
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (197508 => 197509)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-03-03 17:28:27 UTC (rev 197508)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-03-03 17:40:57 UTC (rev 197509)
@@ -1354,7 +1354,7 @@
m_gridItemCoordinate.clear();
}
-static const StyleContentAlignmentData& normalValueBehavior()
+static const StyleContentAlignmentData& normalValueBehaviorGrid()
{
static const StyleContentAlignmentData normalBehavior = {ContentPositionNormal, ContentDistributionStretch};
return normalBehavior;
@@ -1365,8 +1365,8 @@
Optional<LayoutUnit> freeSpace = sizingData.freeSpaceForDirection(direction);
if (!freeSpace
|| freeSpace.value() <= 0
- || (direction == ForColumns && style().resolvedJustifyContentDistribution(normalValueBehavior()) != ContentDistributionStretch)
- || (direction == ForRows && style().resolvedAlignContentDistribution(normalValueBehavior()) != ContentDistributionStretch))
+ || (direction == ForColumns && style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()) != ContentDistributionStretch)
+ || (direction == ForRows && style().resolvedAlignContentDistribution(normalValueBehaviorGrid()) != ContentDistributionStretch))
return;
// Spec defines auto-sized tracks as the ones with an 'auto' max-sizing function.
@@ -1862,7 +1862,7 @@
LayoutUnit childBreadth = child.logicalHeight() + child.marginLogicalHeight();
// In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
if (childEndLine - childStartLine > 1 && childEndLine < m_rowPositions.size() - 1)
- endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(normalValueBehavior()), m_rowPositions, childBreadth);
+ endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(normalValueBehaviorGrid()), m_rowPositions, childBreadth);
LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveAlignmentOverflow(style(), child.style()), endOfRow - startOfRow, childBreadth);
return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
}
@@ -1896,7 +1896,7 @@
LayoutUnit childBreadth = child.logicalWidth() + child.marginLogicalWidth();
// In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
if (childEndLine - childStartLine > 1 && childEndLine < m_columnPositions.size() - 1)
- endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(normalValueBehavior()), m_columnPositions, childBreadth);
+ endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()), m_columnPositions, childBreadth);
LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveJustificationOverflow(style(), child.style()), endOfColumn - startOfColumn, childBreadth);
return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
}
@@ -1959,8 +1959,8 @@
ContentAlignmentData RenderGrid::computeContentPositionAndDistributionOffset(GridTrackSizingDirection direction, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const
{
bool isRowAxis = direction == ForColumns;
- ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition(normalValueBehavior()) : style().resolvedAlignContentPosition(normalValueBehavior());
- ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution(normalValueBehavior()) : style().resolvedAlignContentDistribution(normalValueBehavior());
+ ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition(normalValueBehaviorGrid()) : style().resolvedAlignContentPosition(normalValueBehaviorGrid());
+ ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()) : style().resolvedAlignContentDistribution(normalValueBehaviorGrid());
// If <content-distribution> value can't be applied, 'position' will become the associated
// <content-position> fallback value.
ContentAlignmentData contentAlignment = contentDistributionOffset(availableFreeSpace, position, distribution, numberOfGridTracks);
