<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197509] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197509">197509</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2016-03-03 09:40:57 -0800 (Thu, 03 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AllInOne build fix.
* rendering/RenderFlexibleBox.cpp:
* rendering/RenderGrid.cpp:
Don't have two static functions with the same name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197508 => 197509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2016-03-03 Alexey Proskuryakov <ap@apple.com>
+
+ AllInOne build fix.
+
+ * rendering/RenderFlexibleBox.cpp:
+ * rendering/RenderGrid.cpp:
+ Don't have two static functions with the same name.
+
</ins><span class="cx"> 2016-03-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop [TreatNullAs=EmptyString] from URL interface attributes
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (197508 => 197509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> return child.style().overflowY();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const StyleContentAlignmentData& normalValueBehavior()
</del><ins>+static const StyleContentAlignmentData& normalValueBehaviorFlexibleBox()
</ins><span class="cx"> {
</span><span class="cx"> // The justify-content property applies along the main axis, but since flexing
</span><span class="cx"> // in the main axis is controlled by flex, stretch behaves as flex-start (ignoring
</span><span class="lines">@@ -1106,8 +1106,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(childSizes.size() == children.size());
</span><span class="cx">
</span><del>- ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
</del><ins>+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehaviorFlexibleBox());
</ins><span class="cx">
</span><span class="cx"> size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);
</span><span class="cx"> LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace);
</span><span class="lines">@@ -1190,8 +1190,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace)
</span><span class="cx"> {
</span><del>- ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
</del><ins>+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehaviorFlexibleBox());
</ins><span class="cx">
</span><span class="cx"> // This is similar to the logic in layoutAndPlaceChildren, except we place the children
</span><span class="cx"> // starting from the end of the flexbox. We also don't need to layout anything since we're
</span><span class="lines">@@ -1248,8 +1248,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)
</span><span class="cx"> {
</span><del>- ContentPosition position = style().resolvedAlignContentPosition(normalValueBehavior());
- ContentDistributionType distribution = style().resolvedAlignContentDistribution(normalValueBehavior());
</del><ins>+ ContentPosition position = style().resolvedAlignContentPosition(normalValueBehaviorFlexibleBox());
+ ContentDistributionType distribution = style().resolvedAlignContentDistribution(normalValueBehaviorFlexibleBox());
</ins><span class="cx">
</span><span class="cx"> if (!isMultiline() || position == ContentPositionFlexStart)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (197508 => 197509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> m_gridItemCoordinate.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const StyleContentAlignmentData& normalValueBehavior()
</del><ins>+static const StyleContentAlignmentData& normalValueBehaviorGrid()
</ins><span class="cx"> {
</span><span class="cx"> static const StyleContentAlignmentData normalBehavior = {ContentPositionNormal, ContentDistributionStretch};
</span><span class="cx"> return normalBehavior;
</span><span class="lines">@@ -1365,8 +1365,8 @@
</span><span class="cx"> Optional<LayoutUnit> freeSpace = sizingData.freeSpaceForDirection(direction);
</span><span class="cx"> if (!freeSpace
</span><span class="cx"> || freeSpace.value() <= 0
</span><del>- || (direction == ForColumns && style().resolvedJustifyContentDistribution(normalValueBehavior()) != ContentDistributionStretch)
- || (direction == ForRows && style().resolvedAlignContentDistribution(normalValueBehavior()) != ContentDistributionStretch))
</del><ins>+ || (direction == ForColumns && style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()) != ContentDistributionStretch)
+ || (direction == ForRows && style().resolvedAlignContentDistribution(normalValueBehaviorGrid()) != ContentDistributionStretch))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Spec defines auto-sized tracks as the ones with an 'auto' max-sizing function.
</span><span class="lines">@@ -1862,7 +1862,7 @@
</span><span class="cx"> LayoutUnit childBreadth = child.logicalHeight() + child.marginLogicalHeight();
</span><span class="cx"> // In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
</span><span class="cx"> if (childEndLine - childStartLine > 1 && childEndLine < m_rowPositions.size() - 1)
</span><del>- endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(normalValueBehavior()), m_rowPositions, childBreadth);
</del><ins>+ endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(normalValueBehaviorGrid()), m_rowPositions, childBreadth);
</ins><span class="cx"> LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveAlignmentOverflow(style(), child.style()), endOfRow - startOfRow, childBreadth);
</span><span class="cx"> return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -1896,7 +1896,7 @@
</span><span class="cx"> LayoutUnit childBreadth = child.logicalWidth() + child.marginLogicalWidth();
</span><span class="cx"> // In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
</span><span class="cx"> if (childEndLine - childStartLine > 1 && childEndLine < m_columnPositions.size() - 1)
</span><del>- endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(normalValueBehavior()), m_columnPositions, childBreadth);
</del><ins>+ endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()), m_columnPositions, childBreadth);
</ins><span class="cx"> LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveJustificationOverflow(style(), child.style()), endOfColumn - startOfColumn, childBreadth);
</span><span class="cx"> return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -1959,8 +1959,8 @@
</span><span class="cx"> ContentAlignmentData RenderGrid::computeContentPositionAndDistributionOffset(GridTrackSizingDirection direction, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const
</span><span class="cx"> {
</span><span class="cx"> bool isRowAxis = direction == ForColumns;
</span><del>- ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition(normalValueBehavior()) : style().resolvedAlignContentPosition(normalValueBehavior());
- ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution(normalValueBehavior()) : style().resolvedAlignContentDistribution(normalValueBehavior());
</del><ins>+ ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition(normalValueBehaviorGrid()) : style().resolvedAlignContentPosition(normalValueBehaviorGrid());
+ ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution(normalValueBehaviorGrid()) : style().resolvedAlignContentDistribution(normalValueBehaviorGrid());
</ins><span class="cx"> // If <content-distribution> value can't be applied, 'position' will become the associated
</span><span class="cx"> // <content-position> fallback value.
</span><span class="cx"> ContentAlignmentData contentAlignment = contentDistributionOffset(availableFreeSpace, position, distribution, numberOfGridTracks);
</span></span></pre>
</div>
</div>
</body>
</html>