<!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>[200572] 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/200572">200572</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-05-09 03:17:29 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Fix static position for positioned grid items
https://bugs.webkit.org/show_bug.cgi?id=157417
Reviewed by Darin Adler.
Source/WebCore:
The spec was updated to define properly the static position
for positioned grid items, but we didn't update the implementation yet:
https://drafts.csswg.org/css-grid-1/issues-wd-20150108#issue-1
We were only setting the static position when the start line
was not auto. Otherwise we were using the default one
which includes the padding.
With the spec change we need to set it always,
even if the start line is auto.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutPositionedObject):
(WebCore::RenderGrid::offsetAndBreadthForPositionedChild):
LayoutTests:
Updated several tests to follow the new expected behavior.
* fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html:
* fast/css-grid-layout/absolute-positioning-grid-container-parent.html:
* fast/css-grid-layout/grid-positioned-items-gaps-rtl.html:
* fast/css-grid-layout/grid-positioned-items-gaps.html:
* fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html:
* fast/css-grid-layout/grid-positioned-items-implicit-grid.html:
* fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html:
* fast/css-grid-layout/grid-sizing-positioned-items.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutabsolutepositioninggridcontainercontainingblockhtml">trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutabsolutepositioninggridcontainerparenthtml">trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemsgapsrtlhtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemsgapshtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemsimplicitgridlinehtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemsimplicitgridhtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpositioneditemsunknownnamedgridlinehtml">trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridsizingpositioneditemshtml">trunk/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.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 (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/ChangeLog 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-09 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Fix static position for positioned grid items
+ https://bugs.webkit.org/show_bug.cgi?id=157417
+
+ Reviewed by Darin Adler.
+
+ Updated several tests to follow the new expected behavior.
+
+ * fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html:
+ * fast/css-grid-layout/absolute-positioning-grid-container-parent.html:
+ * fast/css-grid-layout/grid-positioned-items-gaps-rtl.html:
+ * fast/css-grid-layout/grid-positioned-items-gaps.html:
+ * fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html:
+ * fast/css-grid-layout/grid-positioned-items-implicit-grid.html:
+ * fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html:
+ * fast/css-grid-layout/grid-sizing-positioned-items.html:
+
</ins><span class="cx"> 2016-05-09 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix wrong gardening in r200570
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutabsolutepositioninggridcontainercontainingblockhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-containing-block.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sizedToGridArea absolute autoRowAutoColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="530">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="530">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute firstRowFirstColumn"
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="515">
</span><span class="lines">@@ -137,22 +137,22 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows"
</span><del>- data-offset-x="15" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</del><ins>+ data-offset-x="0" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows2Columns"
</span><span class="cx"> data-offset-x="65" data-offset-y="65" data-expected-width="250" data-expected-height="250">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="165" data-expected-height="165">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="165" data-expected-height="165">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndFirstColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="65" data-expected-height="165">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="65" data-expected-height="165">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endFirstRowEndSecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="165" data-expected-height="65">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="165" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endFirstRowEndFirstColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="65" data-expected-height="65">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="65" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="sizedToGridArea absolute autoRowAutoColumn"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="530">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="530">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute firstRowFirstColumn"
</span><span class="cx"> data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="515">
</span><span class="lines">@@ -253,22 +253,22 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows"
</span><del>- data-offset-x="200" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</del><ins>+ data-offset-x="215" data-offset-y="65" data-expected-width="315" data-expected-height="250">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endThirdRowEndThirdColumnSpanning2Rows2Columns"
</span><span class="cx"> data-offset-x="215" data-offset-y="65" data-expected-width="250" data-expected-height="250">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="350" data-offset-y="15" data-expected-width="165" data-expected-height="165">
</del><ins>+ data-offset-x="365" data-offset-y="0" data-expected-width="165" data-expected-height="165">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndFirstColumn"
</span><del>- data-offset-x="450" data-offset-y="15" data-expected-width="65" data-expected-height="165">
</del><ins>+ data-offset-x="465" data-offset-y="0" data-expected-width="65" data-expected-height="165">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endFirstRowEndSecondColumn"
</span><del>- data-offset-x="350" data-offset-y="15" data-expected-width="165" data-expected-height="65">
</del><ins>+ data-offset-x="365" data-offset-y="0" data-expected-width="165" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endFirstRowEndFirstColumn"
</span><del>- data-offset-x="450" data-offset-y="15" data-expected-width="65" data-expected-height="65">
</del><ins>+ data-offset-x="465" data-offset-y="0" data-expected-width="65" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutabsolutepositioninggridcontainerparenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-grid-container-parent.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid relative">
</span><del>- <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="15" data-offset-y="5" data-expected-width="330" data-expected-height="210"></div>
</del><ins>+ <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="0" data-offset-y="0" data-expected-width="330" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid relative directionRTL">
</span><del>- <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="-15" data-offset-y="5" data-expected-width="330" data-expected-height="210"></div>
</del><ins>+ <div class="sizedToGridArea absolute autoRowAutoColumn" data-offset-x="0" data-offset-y="0" data-expected-width="330" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemsgapsrtlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / auto; grid-row: auto / auto;"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: 4 / auto; grid-row: 4 / auto;"
</span><del>- data-offset-x="0" data-offset-y="15" data-expected-width="365" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: 5 / auto; grid-row: 5 / auto;"
</span><del>- data-offset-x="0" data-offset-y="15" data-expected-width="265" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: 6 / auto; grid-row: 6 / auto;"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 1; grid-row: auto / 1;"
</span><del>- data-offset-x="800" data-offset-y="15" data-expected-width="15" data-expected-height="15">
</del><ins>+ data-offset-x="815" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 2; grid-row: auto / 2;"
</span><del>- data-offset-x="700" data-offset-y="15" data-expected-width="115" data-expected-height="65">
</del><ins>+ data-offset-x="715" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 3; grid-row: auto / 3;"
</span><del>- data-offset-x="550" data-offset-y="15" data-expected-width="265" data-expected-height="140">
</del><ins>+ data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 4; grid-row: auto / 4;"
</span><del>- data-offset-x="400" data-offset-y="15" data-expected-width="415" data-expected-height="230">
</del><ins>+ data-offset-x="415" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 5; grid-row: auto / 5;"
</span><del>- data-offset-x="250" data-offset-y="15" data-expected-width="565" data-expected-height="230">
</del><ins>+ data-offset-x="265" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div style="grid-column: auto / 6; grid-row: auto / 6;"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemsgapshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / auto; grid-row: auto / auto;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: 4 / auto; grid-row: 4 / auto;"
</span><del>- data-offset-x="465" data-offset-y="15" data-expected-width="365" data-expected-height="230">
</del><ins>+ data-offset-x="465" data-offset-y="0" data-expected-width="365" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: 5 / auto; grid-row: 5 / auto;"
</span><del>- data-offset-x="565" data-offset-y="15" data-expected-width="265" data-expected-height="230">
</del><ins>+ data-offset-x="565" data-offset-y="0" data-expected-width="265" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: 6 / auto; grid-row: 6 / auto;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 1; grid-row: auto / 1;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="15" data-expected-height="15">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="15">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 2; grid-row: auto / 2;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="115" data-expected-height="65">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="115" data-expected-height="65">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 3; grid-row: auto / 3;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="265" data-expected-height="140">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="265" data-expected-height="140">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 4; grid-row: auto / 4;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="415" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="415" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 5; grid-row: auto / 5;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="565" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="565" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div style="grid-column: auto / 6; grid-row: auto / 6;"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="830" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="830" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemsimplicitgridlinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid-line.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute sizedToGridArea startImplicitLine"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endImplicitLine"
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute sizedToGridArea startImplicitLineSpan"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endImplicitLineSpan"
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute sizedToGridArea startImplicitLine"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endImplicitLine"
</span><span class="cx"> data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute sizedToGridArea startImplicitLineSpan"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endImplicitLineSpan"
</span><span class="cx"> data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemsimplicitgridhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-implicit-grid.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sizedToGridArea absolute secondRowSecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> data-offset-x="115" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
</span><span class="cx"> data-offset-x="115" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="sizedToGridArea absolute secondRowSecondColumn"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> data-offset-x="0" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute endSecondRowEndSecondColumn"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="230" data-expected-height="230">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="230" data-expected-height="230">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="sizedToGridArea absolute onlySecondRowOnlySecondColumn"
</span><span class="cx"> data-offset-x="0" data-offset-y="65" data-expected-width="115" data-expected-height="165">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpositioneditemsunknownnamedgridlinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-positioned-items-unknown-named-grid-line.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -44,25 +44,25 @@
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute sizedToGridArea startAndEndUnknownLines"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endUnknownLine"
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea startUnknownLine"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="315" data-expected-height="215">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute sizedToGridArea startAndEndUnknownLines"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="530" data-expected-height="330">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="530" data-expected-height="330">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea endUnknownLine"
</span><span class="cx"> data-offset-x="0" data-offset-y="15" data-expected-width="515" data-expected-height="315">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute sizedToGridArea startUnknownLine"
</span><del>- data-offset-x="200" data-offset-y="15" data-expected-width="315" data-expected-height="215">
</del><ins>+ data-offset-x="215" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridsizingpositioneditemshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-sizing-positioned-items.html 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .percentageSize {
</span><del>- width: 40%;
</del><ins>+ width: 50%;
</ins><span class="cx"> height: 20%;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -36,6 +36,18 @@
</span><span class="cx"> bottom: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.onlyFirstRowOnlyFirstColumn {
+ background-color: blue;
+ grid-column: 1 / 2;
+ grid-row: 1 / 2;
+}
+
+.endSecondRowEndSecondColumn {
+ background-color: orange;
+ grid-column-end: 3;
+ grid-row-end: 3;
+}
+
</ins><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -45,7 +57,7 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute autoRowAutoColumn sizedToGridArea"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="1030" data-expected-height="1030">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="1030" data-expected-height="1030">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn sizedToGridArea"
</span><span class="cx"> data-offset-x="115" data-offset-y="65" data-expected-width="915" data-expected-height="965">
</span><span class="lines">@@ -54,7 +66,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn sizedToGridArea"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="315" data-expected-height="215">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -62,7 +74,7 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute autoRowAutoColumn lengthSize"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn lengthSize"
</span><span class="cx"> data-offset-x="115" data-offset-y="65" data-expected-width="50" data-expected-height="20">
</span><span class="lines">@@ -71,7 +83,7 @@
</span><span class="cx"> data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn lengthSize"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -79,16 +91,16 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="absolute autoRowAutoColumn percentageSize"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="412" data-expected-height="206">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="515" data-expected-height="206">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn percentageSize"
</span><del>- data-offset-x="115" data-offset-y="65" data-expected-width="366" data-expected-height="193">
</del><ins>+ data-offset-x="115" data-offset-y="65" data-expected-width="458" data-expected-height="193">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute onlyFirstRowOnlyFirstColumn percentageSize"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="40" data-expected-height="10">
</del><ins>+ data-offset-x="15" data-offset-y="15" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn percentageSize"
</span><del>- data-offset-x="15" data-offset-y="15" data-expected-width="126" data-expected-height="43">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="158" data-expected-height="43">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -113,7 +125,7 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute autoRowAutoColumn sizedToGridArea"
</span><del>- data-offset-x="-15" data-offset-y="15" data-expected-width="1030" data-expected-height="1030">
</del><ins>+ data-offset-x="0" data-offset-y="0" data-expected-width="1030" data-expected-height="1030">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn sizedToGridArea"
</span><span class="cx"> data-offset-x="0" data-offset-y="65" data-expected-width="915" data-expected-height="965">
</span><span class="lines">@@ -122,7 +134,7 @@
</span><span class="cx"> data-offset-x="915" data-offset-y="15" data-expected-width="100" data-expected-height="50">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn sizedToGridArea"
</span><del>- data-offset-x="700" data-offset-y="15" data-expected-width="315" data-expected-height="215">
</del><ins>+ data-offset-x="715" data-offset-y="0" data-expected-width="315" data-expected-height="215">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -130,7 +142,7 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute autoRowAutoColumn lengthSize"
</span><del>- data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</del><ins>+ data-offset-x="980" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn lengthSize"
</span><span class="cx"> data-offset-x="865" data-offset-y="65" data-expected-width="50" data-expected-height="20">
</span><span class="lines">@@ -139,7 +151,7 @@
</span><span class="cx"> data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</span><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn lengthSize"
</span><del>- data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="20">
</del><ins>+ data-offset-x="980" data-offset-y="0" data-expected-width="50" data-expected-height="20">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -147,16 +159,16 @@
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid directionRTL">
</span><span class="cx"> <div class="absolute autoRowAutoColumn percentageSize"
</span><del>- data-offset-x="603" data-offset-y="15" data-expected-width="412" data-expected-height="206">
</del><ins>+ data-offset-x="515" data-offset-y="0" data-expected-width="515" data-expected-height="206">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute secondRowSecondColumn percentageSize"
</span><del>- data-offset-x="549" data-offset-y="65" data-expected-width="366" data-expected-height="193">
</del><ins>+ data-offset-x="458" data-offset-y="65" data-expected-width="458" data-expected-height="193">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute onlyFirstRowOnlyFirstColumn percentageSize"
</span><del>- data-offset-x="975" data-offset-y="15" data-expected-width="40" data-expected-height="10">
</del><ins>+ data-offset-x="965" data-offset-y="15" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="absolute endSecondRowEndSecondColumn percentageSize"
</span><del>- data-offset-x="889" data-offset-y="15" data-expected-width="126" data-expected-height="43">
</del><ins>+ data-offset-x="873" data-offset-y="0" data-expected-width="158" data-expected-height="43">
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/Source/WebCore/ChangeLog 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-09 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Fix static position for positioned grid items
+ https://bugs.webkit.org/show_bug.cgi?id=157417
+
+ Reviewed by Darin Adler.
+
+ The spec was updated to define properly the static position
+ for positioned grid items, but we didn't update the implementation yet:
+ https://drafts.csswg.org/css-grid-1/issues-wd-20150108#issue-1
+
+ We were only setting the static position when the start line
+ was not auto. Otherwise we were using the default one
+ which includes the padding.
+ With the spec change we need to set it always,
+ even if the start line is auto.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutPositionedObject):
+ (WebCore::RenderGrid::offsetAndBreadthForPositionedChild):
+
</ins><span class="cx"> 2016-05-08 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> RenderMathMLOperator: refactor management of stretchy data and italic correction
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (200571 => 200572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-05-09 08:55:50 UTC (rev 200571)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-05-09 10:17:29 UTC (rev 200572)
</span><span class="lines">@@ -1520,6 +1520,12 @@
</span><span class="cx"> child.setOverrideContainingBlockContentLogicalHeight(rowBreadth);
</span><span class="cx"> child.setExtraInlineOffset(columnOffset);
</span><span class="cx"> child.setExtraBlockOffset(rowOffset);
</span><ins>+
+ if (child.parent() == this) {
+ auto& childLayer = *child.layer();
+ childLayer.setStaticInlinePosition(borderStart() + columnOffset);
+ childLayer.setStaticBlockPosition(borderBefore() + rowOffset);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBlock::layoutPositionedObject(child, relayoutChildren, fixedPositionObjectsOnly);
</span><span class="lines">@@ -1603,15 +1609,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (child.parent() == this && !startIsAuto) {
- // If column/row start is "auto" the static position has been already set in prepareChildForPositionedLayout().
- RenderLayer* childLayer = child.layer();
- if (isRowAxis)
- childLayer->setStaticInlinePosition(borderStart() + offset);
- else
- childLayer->setStaticBlockPosition(borderBefore() + offset);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GridArea RenderGrid::cachedGridArea(const RenderBox& gridItem) const
</span></span></pre>
</div>
</div>
</body>
</html>