<!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>[201545] 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/201545">201545</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-06-01 00:24:21 -0700 (Wed, 01 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Positioned items can be placed on the implicit grid
https://bugs.webkit.org/show_bug.cgi?id=158197
Reviewed by Sergio Villar Senin.
Source/WebCore:
The old code wrongly assumed that positioned items couldn't be placed
on the implicit grid. However, the spec doesn't mention anything about this.
The patch fixes this issue, so now positioned items can be actually
placed on the implicit tracks.
Test: fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::offsetAndBreadthForPositionedChild): Use the lines
of the implicit grid instead of the explicit one.
LayoutTests:
Updated the test to follow the expected behavior.
* fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt:
* fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemswithingridimplicittrackexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemswithingridimplicittrackhtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201544 => 201545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-01 05:05:25 UTC (rev 201544)
+++ trunk/LayoutTests/ChangeLog 2016-06-01 07:24:21 UTC (rev 201545)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-01 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Positioned items can be placed on the implicit grid
+ https://bugs.webkit.org/show_bug.cgi?id=158197
+
+ Reviewed by Sergio Villar Senin.
+
+ Updated the test to follow the expected behavior.
+
+ * fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt:
+ * fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html:
+
</ins><span class="cx"> 2016-05-31 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r201040): Repainting of moving overflow:hidden objects is broken.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemswithingridimplicittrackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt (201544 => 201545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt 2016-06-01 05:05:25 UTC (rev 201544)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track-expected.txt 2016-06-01 07:24:21 UTC (rev 201545)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-This test checks that positioned grid items are placed properly (ignoring implicit tracks) even if the grid has implicit tracks.
</del><ins>+This test checks that positioned grid items are placed properly (including implicit tracks) even if the grid has implicit tracks.
</ins><span class="cx">
</span><span class="cx"> PASS
</span><span class="cx"> PASS
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemswithingridimplicittrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html (201544 => 201545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html 2016-06-01 05:05:25 UTC (rev 201544)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html 2016-06-01 07:24:21 UTC (rev 201545)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="cx">
</span><del>-<p>This test checks that positioned grid items are placed properly (ignoring implicit tracks) even if the grid has implicit tracks.</p>
</del><ins>+<p>This test checks that positioned grid items are placed properly (including implicit tracks) even if the grid has implicit tracks.</p>
</ins><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sixRowsAndSixColumns"
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: -4 / 1; grid-row: -4 / 1;"
</span><del>- data-offset-x="0" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</del><ins>+ data-offset-x="115" data-offset-y="65" data-expected-width="100" data-expected-height="50">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: -4 / 2; grid-row: -4 / 2;"
</span><del>- data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</del><ins>+ data-offset-x="115" data-offset-y="65" data-expected-width="300" data-expected-height="200">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: 3 / 4; grid-row: 3 / 4;"
</span><del>- data-offset-x="715" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</del><ins>+ data-offset-x="715" data-offset-y="515" data-expected-width="100" data-expected-height="50">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: 2 / 4; grid-row: 2 / 4;"
</span><del>- data-offset-x="415" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</del><ins>+ data-offset-x="415" data-offset-y="265" data-expected-width="400" data-expected-height="300">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: -4 / 1; grid-row: -4 / 1;"
</span><del>- data-offset-x="615" data-offset-y="0" data-expected-width="215" data-expected-height="115">
</del><ins>+ data-offset-x="615" data-offset-y="65" data-expected-width="100" data-expected-height="50">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: -4 / 2; grid-row: -4 / 2;"
</span><del>- data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="265">
</del><ins>+ data-offset-x="415" data-offset-y="65" data-expected-width="300" data-expected-height="200">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: 3 / 4; grid-row: 3 / 4;"
</span><del>- data-offset-x="0" data-offset-y="515" data-expected-width="115" data-expected-height="115">
</del><ins>+ data-offset-x="15" data-offset-y="515" data-expected-width="100" data-expected-height="50">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> data-offset-x="-85" data-offset-y="15" data-expected-width="900" data-expected-height="600">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute" style="grid-column: 2 / 4; grid-row: 2 / 4;"
</span><del>- data-offset-x="0" data-offset-y="265" data-expected-width="415" data-expected-height="365">
</del><ins>+ data-offset-x="15" data-offset-y="265" data-expected-width="400" data-expected-height="300">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201544 => 201545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-01 05:05:25 UTC (rev 201544)
+++ trunk/Source/WebCore/ChangeLog 2016-06-01 07:24:21 UTC (rev 201545)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-01 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Positioned items can be placed on the implicit grid
+ https://bugs.webkit.org/show_bug.cgi?id=158197
+
+ Reviewed by Sergio Villar Senin.
+
+ The old code wrongly assumed that positioned items couldn't be placed
+ on the implicit grid. However, the spec doesn't mention anything about this.
+
+ The patch fixes this issue, so now positioned items can be actually
+ placed on the implicit tracks.
+
+ Test: fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::offsetAndBreadthForPositionedChild): Use the lines
+ of the implicit grid instead of the explicit one.
+
</ins><span class="cx"> 2016-05-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Modernize lambda captures in WorkerThreadableWebSocketChannel
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (201544 => 201545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-06-01 05:05:25 UTC (rev 201544)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-06-01 07:24:21 UTC (rev 201545)
</span><span class="lines">@@ -1683,17 +1683,16 @@
</span><span class="cx">
</span><span class="cx"> GridPosition startPosition = isRowAxis ? child.style().gridItemColumnStart() : child.style().gridItemRowStart();
</span><span class="cx"> GridPosition endPosition = isRowAxis ? child.style().gridItemColumnEnd() : child.style().gridItemRowEnd();
</span><del>- int firstExplicitLine = smallestStart;
- int lastExplicitLine = (isRowAxis ? GridPositionsResolver::explicitGridColumnCount(style(), autoRepeatCount) : GridPositionsResolver::explicitGridRowCount(style(), autoRepeatCount)) + smallestStart;
</del><ins>+ int lastLine = isRowAxis ? gridColumnCount() : gridRowCount();
</ins><span class="cx">
</span><span class="cx"> bool startIsAuto = startPosition.isAuto()
</span><span class="cx"> || (startPosition.isNamedGridArea() && !NamedLineCollection::isValidNamedLineOrArea(startPosition.namedGridLine(), style(), (direction == ForColumns) ? ColumnStartSide : RowStartSide))
</span><del>- || (startLine < firstExplicitLine)
- || (startLine > lastExplicitLine);
</del><ins>+ || (startLine < 0)
+ || (startLine > lastLine);
</ins><span class="cx"> bool endIsAuto = endPosition.isAuto()
</span><span class="cx"> || (endPosition.isNamedGridArea() && !NamedLineCollection::isValidNamedLineOrArea(endPosition.namedGridLine(), style(), (direction == ForColumns) ? ColumnEndSide : RowEndSide))
</span><del>- || (endLine < firstExplicitLine)
- || (endLine > lastExplicitLine);
</del><ins>+ || (endLine < 0)
+ || (endLine > lastLine);
</ins><span class="cx">
</span><span class="cx"> // We're normalizing the positions to avoid issues with RTL (as they're stored in the same order than LTR but adding an offset).
</span><span class="cx"> LayoutUnit start;
</span><span class="lines">@@ -1718,7 +1717,7 @@
</span><span class="cx"> end = m_rowPositions[endLine] - borderBefore();
</span><span class="cx">
</span><span class="cx"> // These vectors store line positions including gaps, but we shouldn't consider them for the edges of the grid.
</span><del>- if (endLine > firstExplicitLine && endLine < lastExplicitLine) {
</del><ins>+ if (endLine > 0 && endLine < lastLine) {
</ins><span class="cx"> end -= guttersSize(direction, 2);
</span><span class="cx"> end -= isRowAxis ? m_offsetBetweenColumns : m_offsetBetweenRows;
</span><span class="cx"> }
</span><span class="lines">@@ -1735,7 +1734,7 @@
</span><span class="cx"> else {
</span><span class="cx"> offset = translateRTLCoordinate(m_columnPositions[endLine]) - borderLogicalLeft();
</span><span class="cx">
</span><del>- if (endLine > firstExplicitLine && endLine < lastExplicitLine) {
</del><ins>+ if (endLine > 0 && endLine < lastLine) {
</ins><span class="cx"> offset += guttersSize(direction, 2);
</span><span class="cx"> offset += isRowAxis ? m_offsetBetweenColumns : m_offsetBetweenRows;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>