<!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>[199341] 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/199341">199341</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-04-12 01:24:38 -0700 (Tue, 12 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[css-grid] Pass GridSizingData instead of columnTracks to track sizing methods
https://bugs.webkit.org/show_bug.cgi?id=156466

Reviewed by Darin Adler.

Several methods used to compute the items' size contribution to the tracks they span in, get
as an argument a vector with the sizes of the column tracks.

In order to support grids with orthogonal flows (among other things) it's much better to
pass the GridSizingData struct and let those methods decide whether to use the columns or
the rows.

No new tests as this is just a minor refactoring with no change in behavior.

* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
(WebCore::RenderGrid::logicalContentHeightForChild):
(WebCore::RenderGrid::minSizeForChild):
(WebCore::RenderGrid::minContentForChild):
(WebCore::RenderGrid::maxContentForChild):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
(WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
* rendering/RenderGrid.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199340 => 199341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-12 07:38:31 UTC (rev 199340)
+++ trunk/Source/WebCore/ChangeLog        2016-04-12 08:24:38 UTC (rev 199341)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-04-12  Sergio Villar Senin  &lt;svillar@igalia.com&gt;
+
+        [css-grid] Pass GridSizingData instead of columnTracks to track sizing methods
+        https://bugs.webkit.org/show_bug.cgi?id=156466
+
+        Reviewed by Darin Adler.
+
+        Several methods used to compute the items' size contribution to the tracks they span in, get
+        as an argument a vector with the sizes of the column tracks.
+
+        In order to support grids with orthogonal flows (among other things) it's much better to
+        pass the GridSizingData struct and let those methods decide whether to use the columns or
+        the rows.
+
+        No new tests as this is just a minor refactoring with no change in behavior.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
+        (WebCore::RenderGrid::logicalContentHeightForChild):
+        (WebCore::RenderGrid::minSizeForChild):
+        (WebCore::RenderGrid::minContentForChild):
+        (WebCore::RenderGrid::maxContentForChild):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+        (WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
+        * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2016-04-11  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove UsePointersEvenForNonNullableObjectArguments from HTMLOptionsCollection
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (199340 => 199341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp        2016-04-12 07:38:31 UTC (rev 199340)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp        2016-04-12 08:24:38 UTC (rev 199341)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx">                 if (i &gt; 0 &amp;&amp; span.startLine() &lt;= flexibleSizedTracksIndex[i - 1])
</span><span class="cx">                     continue;
</span><span class="cx"> 
</span><del>-                flexFraction = std::max(flexFraction, findFlexFactorUnitSize(tracks, span, direction, maxContentForChild(*gridItem, direction, sizingData.columnTracks)));
</del><ins>+                flexFraction = std::max(flexFraction, findFlexFactorUnitSize(tracks, span, direction, maxContentForChild(*gridItem, direction, sizingData)));
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -713,10 +713,10 @@
</span><span class="cx">     return GridTrackSize(minTrackBreadth, maxTrackBreadth);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::logicalContentHeightForChild(RenderBox&amp; child, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+LayoutUnit RenderGrid::logicalContentHeightForChild(RenderBox&amp; child, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     Optional&lt;LayoutUnit&gt; oldOverrideContainingBlockContentLogicalWidth = child.hasOverrideContainingBlockLogicalWidth() ? child.overrideContainingBlockContentLogicalWidth() : LayoutUnit();
</span><del>-    LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, columnTracks);
</del><ins>+    LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, sizingData.columnTracks);
</ins><span class="cx">     if (child.hasOverrideLogicalContentHeight() || child.hasRelativeLogicalHeight() || !oldOverrideContainingBlockContentLogicalWidth || oldOverrideContainingBlockContentLogicalWidth.value() != overrideContainingBlockContentLogicalWidth)
</span><span class="cx">         child.setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> 
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx">     return child.logicalHeight() + child.marginLogicalHeight();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::minSizeForChild(RenderBox&amp; child, GridTrackSizingDirection direction, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+LayoutUnit RenderGrid::minSizeForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
</span><span class="cx">     // FIXME: Properly support orthogonal writing mode.
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx">     const Length&amp; childMinSize = isRowAxis ? child.style().logicalMinWidth() : child.style().logicalMinHeight();
</span><span class="cx">     const Length&amp; childSize = isRowAxis ? child.style().logicalWidth() : child.style().logicalHeight();
</span><span class="cx">     if (!childSize.isAuto() || childMinSize.isAuto())
</span><del>-        return minContentForChild(child, direction, columnTracks);
</del><ins>+        return minContentForChild(child, direction, sizingData);
</ins><span class="cx"> 
</span><span class="cx">     if (isRowAxis)
</span><span class="cx">         return child.computeLogicalWidthInRegionUsing(MinSize, childMinSize, contentLogicalWidth(), *this, nullptr);
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx">     return child.computeLogicalHeightUsing(MinSize, childMinSize, Nullopt).valueOr(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::minContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+LayoutUnit RenderGrid::minContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
</span><span class="cx">     // FIXME: Properly support orthogonal writing mode.
</span><span class="lines">@@ -771,10 +771,10 @@
</span><span class="cx">         return child.minPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(child);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return logicalContentHeightForChild(child, columnTracks);
</del><ins>+    return logicalContentHeightForChild(child, sizingData);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::maxContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+LayoutUnit RenderGrid::maxContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();
</span><span class="cx">     // FIXME: Properly support orthogonal writing mode.
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx">         return child.maxPreferredLogicalWidth() + marginIntrinsicLogicalWidthForChild(child);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return logicalContentHeightForChild(child, columnTracks);
</del><ins>+    return logicalContentHeightForChild(child, sizingData);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> class GridItemWithSpan {
</span><span class="lines">@@ -844,7 +844,7 @@
</span><span class="cx">             if (itemsSet.add(gridItem).isNewEntry) {
</span><span class="cx">                 const GridSpan&amp; span = cachedGridSpan(*gridItem, direction);
</span><span class="cx">                 if (span.integerSpan() == 1)
</span><del>-                    resolveContentBasedTrackSizingFunctionsForNonSpanningItems(direction, span, *gridItem, track, sizingData.columnTracks);
</del><ins>+                    resolveContentBasedTrackSizingFunctionsForNonSpanningItems(direction, span, *gridItem, track, sizingData);
</ins><span class="cx">                 else if (!spanningItemCrossesFlexibleSizedTracks(span, direction))
</span><span class="cx">                     sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, span));
</span><span class="cx">             }
</span><span class="lines">@@ -871,22 +871,22 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan&amp; span, RenderBox&amp; gridItem, GridTrack&amp; track, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan&amp; span, RenderBox&amp; gridItem, GridTrack&amp; track, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     unsigned trackPosition = span.startLine();
</span><span class="cx">     GridTrackSize trackSize = gridTrackSize(direction, trackPosition);
</span><span class="cx"> 
</span><span class="cx">     if (trackSize.hasMinContentMinTrackBreadth())
</span><del>-        track.setBaseSize(std::max(track.baseSize(), minContentForChild(gridItem, direction, columnTracks)));
</del><ins>+        track.setBaseSize(std::max(track.baseSize(), minContentForChild(gridItem, direction, sizingData)));
</ins><span class="cx">     else if (trackSize.hasMaxContentMinTrackBreadth())
</span><del>-        track.setBaseSize(std::max(track.baseSize(), maxContentForChild(gridItem, direction, columnTracks)));
</del><ins>+        track.setBaseSize(std::max(track.baseSize(), maxContentForChild(gridItem, direction, sizingData)));
</ins><span class="cx">     else if (trackSize.hasAutoMinTrackBreadth())
</span><del>-        track.setBaseSize(std::max(track.baseSize(), minSizeForChild(gridItem, direction, columnTracks)));
</del><ins>+        track.setBaseSize(std::max(track.baseSize(), minSizeForChild(gridItem, direction, sizingData)));
</ins><span class="cx"> 
</span><span class="cx">     if (trackSize.hasMinContentMaxTrackBreadth())
</span><del>-        track.setGrowthLimit(std::max(track.growthLimit(), minContentForChild(gridItem, direction, columnTracks)));
</del><ins>+        track.setGrowthLimit(std::max(track.growthLimit(), minContentForChild(gridItem, direction, sizingData)));
</ins><span class="cx">     else if (trackSize.hasMaxContentOrAutoMaxTrackBreadth())
</span><del>-        track.setGrowthLimit(std::max(track.growthLimit(), maxContentForChild(gridItem, direction, columnTracks)));
</del><ins>+        track.setGrowthLimit(std::max(track.growthLimit(), maxContentForChild(gridItem, direction, sizingData)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> const LayoutUnit&amp; RenderGrid::trackSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, GridTrack&amp; track, TrackSizeRestriction restriction)
</span><span class="lines">@@ -991,17 +991,17 @@
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, RenderBox&amp; gridItem, GridTrackSizingDirection direction, Vector&lt;GridTrack&gt;&amp; columnTracks)
</del><ins>+LayoutUnit RenderGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, RenderBox&amp; gridItem, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</ins><span class="cx"> {
</span><span class="cx">     switch (phase) {
</span><span class="cx">     case ResolveIntrinsicMinimums:
</span><del>-        return minSizeForChild(gridItem, direction, columnTracks);
</del><ins>+        return minSizeForChild(gridItem, direction, sizingData);
</ins><span class="cx">     case ResolveContentBasedMinimums:
</span><span class="cx">     case ResolveIntrinsicMaximums:
</span><del>-        return minContentForChild(gridItem, direction, columnTracks);
</del><ins>+        return minContentForChild(gridItem, direction, sizingData);
</ins><span class="cx">     case ResolveMaxContentMinimums:
</span><span class="cx">     case ResolveMaxContentMaximums:
</span><del>-        return maxContentForChild(gridItem, direction, columnTracks);
</del><ins>+        return maxContentForChild(gridItem, direction, sizingData);
</ins><span class="cx">     case MaximizeTracks:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return 0;
</span><span class="lines">@@ -1046,7 +1046,7 @@
</span><span class="cx"> 
</span><span class="cx">         spanningTracksSize += guttersSize(direction, itemSpan.integerSpan());
</span><span class="cx"> 
</span><del>-        LayoutUnit extraSpace = currentItemSizeForTrackSizeComputationPhase(phase, gridItemWithSpan.gridItem(), direction, sizingData.columnTracks) - spanningTracksSize;
</del><ins>+        LayoutUnit extraSpace = currentItemSizeForTrackSizeComputationPhase(phase, gridItemWithSpan.gridItem(), direction, sizingData) - spanningTracksSize;
</ins><span class="cx">         extraSpace = std::max&lt;LayoutUnit&gt;(extraSpace, 0);
</span><span class="cx">         auto&amp; tracksToGrowBeyondGrowthLimits = sizingData.growBeyondGrowthLimitsTracks.isEmpty() ? sizingData.filteredTracks : sizingData.growBeyondGrowthLimitsTracks;
</span><span class="cx">         distributeSpaceToTracks&lt;phase&gt;(sizingData.filteredTracks, &amp;tracksToGrowBeyondGrowthLimits, extraSpace);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (199340 => 199341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h        2016-04-12 07:38:31 UTC (rev 199340)
+++ trunk/Source/WebCore/rendering/RenderGrid.h        2016-04-12 08:24:38 UTC (rev 199341)
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx">     static bool trackShouldGrowBeyondGrowthLimitsForTrackSizeComputationPhase(TrackSizeComputationPhase, const GridTrackSize&amp;);
</span><span class="cx">     static void markAsInfinitelyGrowableForTrackSizeComputationPhase(TrackSizeComputationPhase, GridTrack&amp;);
</span><span class="cx">     static void updateTrackSizeForTrackSizeComputationPhase(TrackSizeComputationPhase, GridTrack&amp;);
</span><del>-    LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase, RenderBox&amp;, GridTrackSizingDirection, Vector&lt;GridTrack&gt;&amp; columnTracks);
</del><ins>+    LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase, RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;);
</ins><span class="cx"> 
</span><span class="cx">     typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange;
</span><del>-    void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridSpan&amp;, RenderBox&amp; gridItem, GridTrack&amp;, Vector&lt;GridTrack&gt;&amp; columnTracks);
</del><ins>+    void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridSpan&amp;, RenderBox&amp; gridItem, GridTrack&amp;, GridSizingData&amp;);
</ins><span class="cx">     template &lt;TrackSizeComputationPhase&gt; void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&amp;, const GridItemsSpanGroupRange&amp;);
</span><span class="cx">     template &lt;TrackSizeComputationPhase&gt; void distributeSpaceToTracks(Vector&lt;GridTrack*&gt;&amp;, const Vector&lt;GridTrack*&gt;* growBeyondGrowthLimitsTracks, LayoutUnit&amp; availableLogicalSpace);
</span><span class="cx"> 
</span><span class="lines">@@ -130,10 +130,10 @@
</span><span class="cx"> 
</span><span class="cx">     GridTrackSize gridTrackSize(GridTrackSizingDirection, unsigned) const;
</span><span class="cx"> 
</span><del>-    LayoutUnit logicalContentHeightForChild(RenderBox&amp;, Vector&lt;GridTrack&gt;&amp;);
-    LayoutUnit minSizeForChild(RenderBox&amp;, GridTrackSizingDirection, Vector&lt;GridTrack&gt;&amp; columnTracks);
-    LayoutUnit minContentForChild(RenderBox&amp;, GridTrackSizingDirection, Vector&lt;GridTrack&gt;&amp; columnTracks);
-    LayoutUnit maxContentForChild(RenderBox&amp;, GridTrackSizingDirection, Vector&lt;GridTrack&gt;&amp; columnTracks);
</del><ins>+    LayoutUnit logicalContentHeightForChild(RenderBox&amp;, GridSizingData&amp;);
+    LayoutUnit minSizeForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;);
+    LayoutUnit minContentForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;);
+    LayoutUnit maxContentForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;);
</ins><span class="cx">     GridAxisPosition columnAxisPositionForChild(const RenderBox&amp;) const;
</span><span class="cx">     GridAxisPosition rowAxisPositionForChild(const RenderBox&amp;) const;
</span><span class="cx">     LayoutUnit columnAxisOffsetForChild(const RenderBox&amp;) const;
</span></span></pre>
</div>
</div>

</body>
</html>