<!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>[203220] 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/203220">203220</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-07-14 01:36:10 -0700 (Thu, 14 Jul 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[css-grid] Const-ify track sizing algorithm
https://bugs.webkit.org/show_bug.cgi?id=159716

Reviewed by Carlos Garcia Campos.

All the methods used to run the track sizing algorithm should not
modify the state of LayoutGrid. We can safely const-ify all of them
and remove the ugly const_cast in computeIntrinsicLogicalWidths().

No new tests needed as there is no change in behavior.

* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::logicalHeightForChild):
(WebCore::RenderGrid::minSizeForChild):
(WebCore::RenderGrid::updateOverrideContainingBlockContentLogicalWidthForChild):
(WebCore::RenderGrid::minContentForChild):
(WebCore::RenderGrid::maxContentForChild):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
(WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
(WebCore::RenderGrid::distributeSpaceToTracks):
* 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 (203219 => 203220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-14 07:54:21 UTC (rev 203219)
+++ trunk/Source/WebCore/ChangeLog        2016-07-14 08:36:10 UTC (rev 203220)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-14  Sergio Villar Senin  &lt;svillar@igalia.com&gt;
+
+        [css-grid] Const-ify track sizing algorithm
+        https://bugs.webkit.org/show_bug.cgi?id=159716
+
+        Reviewed by Carlos Garcia Campos.
+
+        All the methods used to run the track sizing algorithm should not
+        modify the state of LayoutGrid. We can safely const-ify all of them
+        and remove the ugly const_cast in computeIntrinsicLogicalWidths().
+
+        No new tests needed as there is no change in behavior.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::logicalHeightForChild):
+        (WebCore::RenderGrid::minSizeForChild):
+        (WebCore::RenderGrid::updateOverrideContainingBlockContentLogicalWidthForChild):
+        (WebCore::RenderGrid::minContentForChild):
+        (WebCore::RenderGrid::maxContentForChild):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+        (WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
+        (WebCore::RenderGrid::distributeSpaceToTracks):
+        * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2016-07-14  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (203219 => 203220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp        2016-07-14 07:54:21 UTC (rev 203219)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp        2016-07-14 08:36:10 UTC (rev 203220)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx">     GridSizingData sizingData(gridColumnCount(), gridRowCount());
</span><span class="cx">     sizingData.setFreeSpaceForDirection(ForColumns, Nullopt);
</span><span class="cx">     sizingData.sizingOperation = IntrinsicSizeComputation;
</span><del>-    const_cast&lt;RenderGrid*&gt;(this)-&gt;computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
</del><ins>+    computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
</ins><span class="cx"> 
</span><span class="cx">     LayoutUnit totalGuttersSize = guttersSize(ForColumns, sizingData.columnTracks.size());
</span><span class="cx">     minLogicalWidth += totalGuttersSize;
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx">     return track.baseSize() / std::max&lt;double&gt;(1, flexFactor);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderGrid::computeUsedBreadthOfGridTracks(GridTrackSizingDirection direction, GridSizingData&amp; sizingData, LayoutUnit&amp; baseSizesWithoutMaximization, LayoutUnit&amp; growthLimitsWithoutMaximization)
</del><ins>+void RenderGrid::computeUsedBreadthOfGridTracks(GridTrackSizingDirection direction, GridSizingData&amp; sizingData, LayoutUnit&amp; baseSizesWithoutMaximization, LayoutUnit&amp; growthLimitsWithoutMaximization) const
</ins><span class="cx"> {
</span><span class="cx">     const Optional&lt;LayoutUnit&gt; initialFreeSpace = sizingData.freeSpaceForDirection(direction);
</span><span class="cx">     Vector&lt;GridTrack&gt;&amp; tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx">     return GridTrackSize(minTrackBreadth, maxTrackBreadth);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::logicalHeightForChild(RenderBox&amp; child, GridSizingData&amp; sizingData)
</del><ins>+LayoutUnit RenderGrid::logicalHeightForChild(RenderBox&amp; child, GridSizingData&amp; sizingData) const
</ins><span class="cx"> {
</span><span class="cx">     Optional&lt;LayoutUnit&gt; oldOverrideContainingBlockContentLogicalWidth = child.hasOverrideContainingBlockLogicalWidth() ? child.overrideContainingBlockContentLogicalWidth() : LayoutUnit();
</span><span class="cx">     LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, sizingData.columnTracks);
</span><span class="lines">@@ -797,7 +797,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, GridSizingData&amp; sizingData)
</del><ins>+LayoutUnit RenderGrid::minSizeForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData) const
</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">@@ -822,7 +822,7 @@
</span><span class="cx">     return child.computeLogicalHeightUsing(MinSize, childMinSize, Nullopt).valueOr(0) + child.marginLogicalHeight() + child.scrollbarLogicalHeight();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderGrid::updateOverrideContainingBlockContentLogicalWidthForChild(RenderBox&amp; child, GridSizingData&amp; sizingData)
</del><ins>+bool RenderGrid::updateOverrideContainingBlockContentLogicalWidthForChild(RenderBox&amp; child, GridSizingData&amp; sizingData) const
</ins><span class="cx"> {
</span><span class="cx">     LayoutUnit overrideWidth = gridAreaBreadthForChild(child, ForColumns, sizingData.columnTracks);
</span><span class="cx">     if (child.hasOverrideContainingBlockLogicalWidth() &amp;&amp; child.overrideContainingBlockContentLogicalWidth() == overrideWidth)
</span><span class="lines">@@ -832,7 +832,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::minContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</del><ins>+LayoutUnit RenderGrid::minContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData) const
</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">@@ -855,7 +855,7 @@
</span><span class="cx">     return logicalHeightForChild(child, sizingData);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutUnit RenderGrid::maxContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</del><ins>+LayoutUnit RenderGrid::maxContentForChild(RenderBox&amp; child, GridTrackSizingDirection direction, GridSizingData&amp; sizingData) const
</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">@@ -915,7 +915,7 @@
</span><span class="cx">     Vector&lt;GridItemWithSpan&gt;::iterator rangeEnd;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-void RenderGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData&amp; sizingData)
</del><ins>+void RenderGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData&amp; sizingData) const
</ins><span class="cx"> {
</span><span class="cx">     sizingData.itemsSortedByIncreasingSpan.shrink(0);
</span><span class="cx">     HashSet&lt;RenderBox*&gt; itemsSet;
</span><span class="lines">@@ -956,7 +956,7 @@
</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, GridSizingData&amp; sizingData)
</del><ins>+void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan&amp; span, RenderBox&amp; gridItem, GridTrack&amp; track, GridSizingData&amp; sizingData) const
</ins><span class="cx"> {
</span><span class="cx">     unsigned trackPosition = span.startLine();
</span><span class="cx">     GridTrackSize trackSize = gridTrackSize(direction, trackPosition, sizingData.sizingOperation);
</span><span class="lines">@@ -1076,7 +1076,7 @@
</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, GridSizingData&amp; sizingData)
</del><ins>+LayoutUnit RenderGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, RenderBox&amp; gridItem, GridTrackSizingDirection direction, GridSizingData&amp; sizingData) const
</ins><span class="cx"> {
</span><span class="cx">     switch (phase) {
</span><span class="cx">     case ResolveIntrinsicMinimums:
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template &lt;RenderGrid::TrackSizeComputationPhase phase&gt;
</span><del>-void RenderGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData&amp; sizingData, const GridItemsSpanGroupRange&amp; gridItemsWithSpan)
</del><ins>+void RenderGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData&amp; sizingData, const GridItemsSpanGroupRange&amp; gridItemsWithSpan) const
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;GridTrack&gt;&amp; tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
</span><span class="cx">     for (const auto&amp; trackIndex : sizingData.contentSizedTracksIndex) {
</span><span class="lines">@@ -1158,7 +1158,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template &lt;RenderGrid::TrackSizeComputationPhase phase&gt;
</span><del>-void RenderGrid::distributeSpaceToTracks(Vector&lt;GridTrack*&gt;&amp; tracks, const Vector&lt;GridTrack*&gt;* growBeyondGrowthLimitsTracks, LayoutUnit&amp; freeSpace)
</del><ins>+void RenderGrid::distributeSpaceToTracks(Vector&lt;GridTrack*&gt;&amp; tracks, const Vector&lt;GridTrack*&gt;* growBeyondGrowthLimitsTracks, LayoutUnit&amp; freeSpace) const
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(freeSpace &gt;= 0);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (203219 => 203220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h        2016-07-14 07:54:21 UTC (rev 203219)
+++ trunk/Source/WebCore/rendering/RenderGrid.h        2016-07-14 08:36:10 UTC (rev 203220)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx">     class GridIterator;
</span><span class="cx">     class GridSizingData;
</span><span class="cx">     enum SizingOperation { TrackSizing, IntrinsicSizeComputation };
</span><del>-    void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData&amp;, LayoutUnit&amp; baseSizesWithoutMaximization, LayoutUnit&amp; growthLimitsWithoutMaximization);
</del><ins>+    void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData&amp;, LayoutUnit&amp; baseSizesWithoutMaximization, LayoutUnit&amp; growthLimitsWithoutMaximization) const;
</ins><span class="cx">     LayoutUnit computeUsedBreadthOfMinLength(const GridLength&amp;, LayoutUnit maxSize) const;
</span><span class="cx">     LayoutUnit computeUsedBreadthOfMaxLength(const GridLength&amp;, LayoutUnit usedBreadth, LayoutUnit maxSize) const;
</span><del>-    void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridSizingData&amp;);
</del><ins>+    void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridSizingData&amp;) const;
</ins><span class="cx"> 
</span><span class="cx">     void ensureGridSize(unsigned maximumRowSize, unsigned maximumColumnSize);
</span><span class="cx">     void insertItemIntoGrid(RenderBox&amp;, const GridArea&amp;);
</span><span class="lines">@@ -124,12 +124,12 @@
</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, GridSizingData&amp;);
</del><ins>+    LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase, RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;) const;
</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;, GridSizingData&amp;);
-    template &lt;TrackSizeComputationPhase&gt; void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&amp;, const GridItemsSpanGroupRange&amp;);
-    template &lt;TrackSizeComputationPhase&gt; void distributeSpaceToTracks(Vector&lt;GridTrack*&gt;&amp;, const Vector&lt;GridTrack*&gt;* growBeyondGrowthLimitsTracks, LayoutUnit&amp; availableLogicalSpace);
</del><ins>+    void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridSpan&amp;, RenderBox&amp; gridItem, GridTrack&amp;, GridSizingData&amp;) const;
+    template &lt;TrackSizeComputationPhase&gt; void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&amp;, const GridItemsSpanGroupRange&amp;) const;
+    template &lt;TrackSizeComputationPhase&gt; void distributeSpaceToTracks(Vector&lt;GridTrack*&gt;&amp;, const Vector&lt;GridTrack*&gt;* growBeyondGrowthLimitsTracks, LayoutUnit&amp; availableLogicalSpace) const;
</ins><span class="cx"> 
</span><span class="cx">     typedef HashSet&lt;unsigned, DefaultHash&lt;unsigned&gt;::Hash, WTF::UnsignedWithZeroKeyHashTraits&lt;unsigned&gt;&gt; TrackIndexSet;
</span><span class="cx">     double computeFlexFactorUnitSize(const Vector&lt;GridTrack&gt;&amp;, GridTrackSizingDirection, SizingOperation, double flexFactorSum, LayoutUnit leftOverSpace, const Vector&lt;unsigned, 8&gt;&amp; flexibleTracksIndexes, std::unique_ptr&lt;TrackIndexSet&gt; tracksToTreatAsInflexible = nullptr) const;
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx">     const GridTrackSize&amp; rawGridTrackSize(GridTrackSizingDirection, unsigned) const;
</span><span class="cx">     GridTrackSize gridTrackSize(GridTrackSizingDirection, unsigned, SizingOperation) const;
</span><span class="cx"> 
</span><del>-    bool updateOverrideContainingBlockContentLogicalWidthForChild(RenderBox&amp;, GridSizingData&amp;);
-    LayoutUnit logicalHeightForChild(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;);
</del><ins>+    bool updateOverrideContainingBlockContentLogicalWidthForChild(RenderBox&amp;, GridSizingData&amp;) const;
+    LayoutUnit logicalHeightForChild(RenderBox&amp;, GridSizingData&amp;) const;
+    LayoutUnit minSizeForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;) const;
+    LayoutUnit minContentForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;) const;
+    LayoutUnit maxContentForChild(RenderBox&amp;, GridTrackSizingDirection, GridSizingData&amp;) const;
</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>