<!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>[205114] trunk</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/205114">205114</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-08-29 01:50:13 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Do not recursively call layout during auto repeat computation
https://bugs.webkit.org/show_bug.cgi?id=161234
Reviewed by Manuel Rego Casasnovas.
Source/WebCore:
The computation of auto repeat tracks was incorrectly recursively triggering
a layout in order to compute the available size. That was happening whenever
the width was indefinite. In such cases we should treat the width always as
indefinite without having to run any extra code. During the layout phase
we'll have the actual width available.
This fix also unveiled a few errors in one of the imported mozilla tests which were
incorrectly passing when they should not.
Test: fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutBlock):
(WebCore::RenderGrid::computeIntrinsicLogicalWidths):
(WebCore::RenderGrid::computeAutoRepeatTracksCount):
(WebCore::RenderGrid::placeItemsOnGrid):
* rendering/RenderGrid.h:
LayoutTests:
Added a new test case and fixed a few tests inside the imported
grid-repeat-auto-fill-fit-001.html which were wrong due to a bug in Firefox. The intrinsic
size computation was not considering the existence of definite minimum sizes for some of the
grids so the outcome was narrower than expected.
* fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt: Added.
* fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html: Added.
* fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutmozillagridrepeatautofillfit001expectedhtml">trunk/LayoutTests/fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html</a></li>
<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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashhtml">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205113 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-29 08:06:28 UTC (rev 205113)
+++ trunk/LayoutTests/ChangeLog 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-26 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Do not recursively call layout during auto repeat computation
+ https://bugs.webkit.org/show_bug.cgi?id=161234
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ Added a new test case and fixed a few tests inside the imported
+ grid-repeat-auto-fill-fit-001.html which were wrong due to a bug in Firefox. The intrinsic
+ size computation was not considering the existence of definite minimum sizes for some of the
+ grids so the outcome was narrower than expected.
+
+ * fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt: Added.
+ * fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html: Added.
+ * fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html:
+
</ins><span class="cx"> 2016-08-25 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add support for non-BMP operators U+1EEF0 and U+1EEF1
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt (0 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+item
+item
+item
+item
+item
+item
+item
+item
+item
+item
+This test checks that the computation of auto repeat tracks works when the grid container width is indefinite.
+
+This test has PASSED if it didn't CRASH.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfastcssgridlayoutgridindefinitesizeautorepeatcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html (0 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE HTML>
+<link href="resources/grid.css" rel="stylesheet">
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
+<link href="../css-intrinsic-dimensions/resources/height-keyword-classes.css" rel=stylesheet>
+<style>
+.autoFill { grid: repeat(auto-fill, 100px) / repeat(auto-fill, 100px); }
+.autoFit { grid: repeat(auto-fit, 100px) / repeat(auto-fit, 100px); }
+</style>
+
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<div class="grid autoFill"></div>
+<div class="grid autoFit"></div>
+
+<div class="grid autoFill min-content"></div>
+<div class="grid autoFit min-content"></div>
+
+<div class="grid autoFill max-content"></div>
+<div class="grid autoFit max-content"></div>
+
+<div class="grid autoFill min-width-min-content min-height-min-content"></div>
+<div class="grid autoFit min-width-min-content min-height-min-content"></div>
+
+<div class="grid autoFill min-width-max-content min-height-max-content"></div>
+<div class="grid autoFit min-width-max-content min-height-max-content"></div>
+
+<div class="grid autoFill">item</div>
+<div class="grid autoFit">item</div>
+
+<div class="grid autoFill min-content">item</div>
+<div class="grid autoFit min-content">item</div>
+
+<div class="grid autoFill max-content">item</div>
+<div class="grid autoFit max-content">item</div>
+
+<div class="grid autoFill min-width-min-content min-height-min-content">item</div>
+<div class="grid autoFit min-width-min-content min-height-min-content">item</div>
+
+<div class="grid autoFill min-width-max-content min-height-max-content">item</div>
+<div class="grid autoFit min-width-max-content min-height-max-content">item</div>
+
+<p>This test checks that the computation of auto repeat tracks works when the grid container width is indefinite.</p>
+<p>This test has PASSED if it didn't CRASH.</p>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+LF
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfastcssgridlayoutmozillagridrepeatautofillfit001expectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html (205113 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html 2016-08-29 08:06:28 UTC (rev 205113)
+++ trunk/LayoutTests/fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-001-expected.html 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> <div class="grid r1 xw80"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 xw50 c2"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 w100 xw80"><x></x><x></x><a></a><b></b><x></x></div>
</span><del>-<div class="grid r1 mw50 float c2"><x></x><x></x><a></a><b></b><x></x></div>
-<div class="grid r1 mw80 float"><x></x><x></x><a></a><b></b><x></x></div>
</del><ins>+<div class="grid r1 mw50 float"><x></x><x></x><a></a><b></b><x></x></div>
+<div class="grid r1 mw80 float c4"><x></x><x></x><a></a><b></b><x></x></div>
</ins><span class="cx"> <div class="grid r1 w100 mw50 float c4"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 mw100 w50 float c4"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> <div class="grid r2 xw50 c1"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 w100 xw80 c2"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 mw50 float c1"><x></x><x></x><a></a><b></b><x></x></div>
</span><del>-<div class="grid r2 mw80 float c2"><x></x><x></x><a></a><b></b><x></x></div>
</del><ins>+<div class="grid r2 mw80 float"><x></x><x></x><a></a><b></b><x></x></div>
</ins><span class="cx"> <div class="grid r2 w100 mw50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 mw100 w50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> <div class="grid r1 xw80"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 xw50 c2"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 w100 xw80"><x></x><x></x><a></a><b></b><x></x></div>
</span><del>-<div class="grid r1 mw50 float c2"><x></x><x></x><a></a><b></b><x></x></div>
</del><ins>+<div class="grid r1 mw50 float"><x></x><x></x><a></a><b></b><x></x></div>
</ins><span class="cx"> <div class="grid r1 mw80 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 w100 mw50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r1 mw100 w50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> <div class="grid r2 xw50 c1"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 w100 xw80 c2"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 mw50 float c1"><x></x><x></x><a></a><b></b><x></x></div>
</span><del>-<div class="grid r2 mw80 float c2"><x></x><x></x><a></a><b></b><x></x></div>
</del><ins>+<div class="grid r2 mw80 float"><x></x><x></x><a></a><b></b><x></x></div>
</ins><span class="cx"> <div class="grid r2 w100 mw50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx"> <div class="grid r2 mw100 w50 float"><x></x><x></x><a></a><b></b><x></x></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205113 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-29 08:06:28 UTC (rev 205113)
+++ trunk/Source/WebCore/ChangeLog 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-26 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Do not recursively call layout during auto repeat computation
+ https://bugs.webkit.org/show_bug.cgi?id=161234
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ The computation of auto repeat tracks was incorrectly recursively triggering
+ a layout in order to compute the available size. That was happening whenever
+ the width was indefinite. In such cases we should treat the width always as
+ indefinite without having to run any extra code. During the layout phase
+ we'll have the actual width available.
+
+ This fix also unveiled a few errors in one of the imported mozilla tests which were
+ incorrectly passing when they should not.
+
+ Test: fast/css-grid-layout/grid-indefinite-size-auto-repeat-crash.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutBlock):
+ (WebCore::RenderGrid::computeIntrinsicLogicalWidths):
+ (WebCore::RenderGrid::computeAutoRepeatTracksCount):
+ (WebCore::RenderGrid::placeItemsOnGrid):
+ * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2016-08-29 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> data:// URL behavior of XHR does not match spec
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (205113 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-08-29 08:06:28 UTC (rev 205113)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> updateLogicalWidth();
</span><span class="cx"> bool logicalHeightWasIndefinite = !computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);
</span><span class="cx">
</span><del>- placeItemsOnGrid();
</del><ins>+ placeItemsOnGrid(TrackSizing);
</ins><span class="cx">
</span><span class="cx"> GridSizingData sizingData(gridColumnCount(), gridRowCount());
</span><span class="cx">
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool wasPopulated = !m_gridIsDirty;
</span><span class="cx"> if (!wasPopulated)
</span><del>- const_cast<RenderGrid*>(this)->placeItemsOnGrid();
</del><ins>+ const_cast<RenderGrid*>(this)->placeItemsOnGrid(IntrinsicSizeComputation);
</ins><span class="cx">
</span><span class="cx"> GridSizingData sizingData(gridColumnCount(), gridRowCount());
</span><span class="cx"> sizingData.setFreeSpaceForDirection(ForColumns, Nullopt);
</span><span class="lines">@@ -1412,7 +1412,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderGrid::computeAutoRepeatTracksCount(GridTrackSizingDirection direction) const
</del><ins>+unsigned RenderGrid::computeAutoRepeatTracksCount(GridTrackSizingDirection direction, SizingOperation sizingOperation) const
</ins><span class="cx"> {
</span><span class="cx"> bool isRowAxis = direction == ForColumns;
</span><span class="cx"> const auto& autoRepeatTracks = isRowAxis ? style().gridAutoRepeatColumns() : style().gridAutoRepeatRows();
</span><span class="lines">@@ -1421,19 +1421,18 @@
</span><span class="cx"> if (!autoRepeatTrackListLength)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Optional<LayoutUnit> availableSize = isRowAxis ? availableLogicalWidth() : computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);
- if (!isRowAxis || containingBlock()) {
</del><ins>+ Optional<LayoutUnit> availableSize;
+ if (isRowAxis) {
+ if (sizingOperation != IntrinsicSizeComputation)
+ availableSize = availableLogicalWidth();
+ } else {
+ availableSize = computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), LayoutUnit(-1));
</ins><span class="cx"> if (!availableSize) {
</span><del>- const Length& maxLength = isRowAxis ? style().logicalMaxWidth() : style().logicalMaxHeight();
- if (!maxLength.isUndefined()) {
- availableSize = isRowAxis
- ? computeLogicalWidthInRegionUsing(MaxSize, maxLength, containingBlockLogicalWidthForContent(), *containingBlock(), nullptr)
- : computeContentLogicalHeight(MaxSize, maxLength, Nullopt);
- }
</del><ins>+ const Length& maxLength = style().logicalMaxHeight();
+ if (!maxLength.isUndefined())
+ availableSize = computeContentLogicalHeight(MaxSize, maxLength, LayoutUnit(-1));
</ins><span class="cx"> } else {
</span><del>- availableSize = isRowAxis
- ? constrainLogicalWidthInRegionByMinMax(availableSize.value(), availableLogicalWidth(), *containingBlock())
- : constrainLogicalHeightByMinMax(availableSize.value(), Nullopt);
</del><ins>+ availableSize = constrainLogicalHeightByMinMax(availableSize.value(), LayoutUnit(-1));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1520,13 +1519,13 @@
</span><span class="cx"> return emptyTrackIndexes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderGrid::placeItemsOnGrid()
</del><ins>+void RenderGrid::placeItemsOnGrid(SizingOperation sizingOperation)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_gridIsDirty);
</span><span class="cx"> ASSERT(m_gridItemArea.isEmpty());
</span><span class="cx">
</span><del>- m_autoRepeatColumns = computeAutoRepeatTracksCount(ForColumns);
- m_autoRepeatRows = computeAutoRepeatTracksCount(ForRows);
</del><ins>+ m_autoRepeatColumns = computeAutoRepeatTracksCount(ForColumns, sizingOperation);
+ m_autoRepeatRows = computeAutoRepeatTracksCount(ForRows, sizingOperation);
</ins><span class="cx">
</span><span class="cx"> populateExplicitGridAndOrderIterator();
</span><span class="cx"> m_gridIsDirty = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (205113 => 205114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-08-29 08:06:28 UTC (rev 205113)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-08-29 08:50:13 UTC (rev 205114)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> void ensureGridSize(unsigned maximumRowSize, unsigned maximumColumnSize);
</span><span class="cx"> void insertItemIntoGrid(RenderBox&, const GridArea&);
</span><span class="cx">
</span><del>- unsigned computeAutoRepeatTracksCount(GridTrackSizingDirection) const;
</del><ins>+ unsigned computeAutoRepeatTracksCount(GridTrackSizingDirection, SizingOperation) const;
</ins><span class="cx">
</span><span class="cx"> typedef ListHashSet<size_t> OrderedTrackIndexSet;
</span><span class="cx"> std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat(GridTrackSizingDirection) const;
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> bool hasAutoRepeatEmptyTracks(GridTrackSizingDirection) const;
</span><span class="cx"> bool isEmptyAutoRepeatTrack(GridTrackSizingDirection, unsigned track) const;
</span><span class="cx">
</span><del>- void placeItemsOnGrid();
</del><ins>+ void placeItemsOnGrid(SizingOperation);
</ins><span class="cx"> void populateExplicitGridAndOrderIterator();
</span><span class="cx"> std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const RenderBox&, GridTrackSizingDirection, const GridSpan&) const;
</span><span class="cx"> void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
</span></span></pre>
</div>
</div>
</body>
</html>