<!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>[183739] 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/183739">183739</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-04 01:37:03 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Wrong computed style for named grid lines in implicit tracks
https://bugs.webkit.org/show_bug.cgi?id=144449
Reviewed by Sergio Villar Senin.
Source/WebCore:
If there're implicit tracks then trackPositions is bigger than
trackSizes, so we need to use the proper index to append the trailing
<ident>s in valueForGridTrackList().
Test: fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::valueForGridTrackList):
LayoutTests:
* fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt: Added.
* fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittracksexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittrackshtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183738 => 183739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-04 08:22:19 UTC (rev 183738)
+++ trunk/LayoutTests/ChangeLog 2015-05-04 08:37:03 UTC (rev 183739)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-04 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Wrong computed style for named grid lines in implicit tracks
+ https://bugs.webkit.org/show_bug.cgi?id=144449
+
+ Reviewed by Sergio Villar Senin.
+
+ * fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt: Added.
+ * fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html: Added.
+
</ins><span class="cx"> 2015-05-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertion failure (!needsLayout()) loading inkedmag.com
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittracksexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt (0 => 183739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks-expected.txt 2015-05-04 08:37:03 UTC (rev 183739)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+Test that computed style for grid-template-columns and grid-template-rows works as expected with named grid lines and implicit tracks
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('-webkit-grid-template-columns') is "(a) 200px (b)"
+PASS window.getComputedStyle(gridOneColumnSingle, '').getPropertyValue('-webkit-grid-template-rows') is "(x) 50px (y) 50px 50px 50px"
+PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "(a) 200px (b) 150px"
+PASS window.getComputedStyle(gridTwoColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "(x) 50px (y) 50px"
+PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "(a) 200px (b) 150px 100px"
+PASS window.getComputedStyle(gridThreeColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "(x) 50px (y) 50px"
+PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('-webkit-grid-template-columns') is "(a) 200px (b) 150px 100px 50px"
+PASS window.getComputedStyle(gridFourColumnsSingle, '').getPropertyValue('-webkit-grid-template-rows') is "(x) 50px (y)"
+PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "(a b c) 200px (d e)"
+PASS window.getComputedStyle(gridOneColumnMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "(x y z) 50px (v w) 50px 50px 50px"
+PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "(a b c) 200px (d e) 150px"
+PASS window.getComputedStyle(gridTwoColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "(x y z) 50px (v w) 50px"
+PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "(a b c) 200px (d e) 150px 100px"
+PASS window.getComputedStyle(gridThreeColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "(x y z) 50px (v w) 50px"
+PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "(a b c) 200px (d e) 150px 100px 50px"
+PASS window.getComputedStyle(gridFourColumnsMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "(x y z) 50px (v w)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
+XXXX
+XXX
+XX
+X
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittrackshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html (0 => 183739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html 2015-05-04 08:37:03 UTC (rev 183739)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+<!DOCTYPE HTML>
+<link href="resources/grid.css" rel="stylesheet">
+<style>
+.grid {
+ font: 50px/1 Ahem;
+}
+
+.singleNamedGridLines {
+ -webkit-grid-template-columns: (a) auto (b);
+ -webkit-grid-template-rows: (x) auto (y);
+}
+
+.multipleNamedGridLines {
+ -webkit-grid-template-columns: (a b c) auto (d e);
+ -webkit-grid-template-rows: (x y z) auto (v w);
+}
+</style>
+<script src="../../resources/js-test.js"></script>
+
+<div class="grid singleNamedGridLines" id="gridOneColumnSingle">
+ <div>XXXX</div>
+ <div>XXX</div>
+ <div>XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid singleNamedGridLines" id="gridTwoColumnsSingle">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div>XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid singleNamedGridLines" id="gridThreeColumnsSingle">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div class="firstRowAutoColumn">XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid singleNamedGridLines" id="gridFourColumnsSingle">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div class="firstRowAutoColumn">XX</div>
+ <div class="firstRowAutoColumn">X</div>
+</div>
+
+<div class="grid multipleNamedGridLines" id="gridOneColumnMultiple">
+ <div>XXXX</div>
+ <div>XXX</div>
+ <div>XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid multipleNamedGridLines" id="gridTwoColumnsMultiple">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div>XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid multipleNamedGridLines" id="gridThreeColumnsMultiple">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div class="firstRowAutoColumn">XX</div>
+ <div>X</div>
+</div>
+
+<div class="grid multipleNamedGridLines" id="gridFourColumnsMultiple">
+ <div class="firstRowAutoColumn">XXXX</div>
+ <div class="firstRowAutoColumn">XXX</div>
+ <div class="firstRowAutoColumn">XX</div>
+ <div class="firstRowAutoColumn">X</div>
+</div>
+
+<script src="resources/grid-definitions-parsing-utils.js"></script>
+<script>
+ description('Test that computed style for grid-template-columns and grid-template-rows works as expected with named grid lines and implicit tracks');
+
+ testGridTemplatesValues(document.getElementById("gridOneColumnSingle"), "(a) 200px (b)", "(x) 50px (y) 50px 50px 50px");
+ testGridTemplatesValues(document.getElementById("gridTwoColumnsSingle"), "(a) 200px (b) 150px", "(x) 50px (y) 50px");
+ testGridTemplatesValues(document.getElementById("gridThreeColumnsSingle"), "(a) 200px (b) 150px 100px", "(x) 50px (y) 50px");
+ testGridTemplatesValues(document.getElementById("gridFourColumnsSingle"), "(a) 200px (b) 150px 100px 50px", "(x) 50px (y)");
+
+ testGridTemplatesValues(document.getElementById("gridOneColumnMultiple"), "(a b c) 200px (d e)", "(x y z) 50px (v w) 50px 50px 50px");
+ testGridTemplatesValues(document.getElementById("gridTwoColumnsMultiple"), "(a b c) 200px (d e) 150px", "(x y z) 50px (v w) 50px");
+ testGridTemplatesValues(document.getElementById("gridThreeColumnsMultiple"), "(a b c) 200px (d e) 150px 100px", "(x y z) 50px (v w) 50px");
+ testGridTemplatesValues(document.getElementById("gridFourColumnsMultiple"), "(a b c) 200px (d e) 150px 100px 50px", "(x y z) 50px (v w)");
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183738 => 183739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-04 08:22:19 UTC (rev 183738)
+++ trunk/Source/WebCore/ChangeLog 2015-05-04 08:37:03 UTC (rev 183739)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-04 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Wrong computed style for named grid lines in implicit tracks
+ https://bugs.webkit.org/show_bug.cgi?id=144449
+
+ Reviewed by Sergio Villar Senin.
+
+ If there're implicit tracks then trackPositions is bigger than
+ trackSizes, so we need to use the proper index to append the trailing
+ <ident>s in valueForGridTrackList().
+
+ Test: fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::valueForGridTrackList):
+
</ins><span class="cx"> 2015-05-03 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr in WebCore/html
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (183738 => 183739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-04 08:22:19 UTC (rev 183738)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-04 08:37:03 UTC (rev 183739)
</span><span class="lines">@@ -1053,6 +1053,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><ins>+ unsigned insertionIndex;
</ins><span class="cx"> if (isRenderGrid) {
</span><span class="cx"> const Vector<LayoutUnit>& trackPositions = direction == ForColumns ? downcast<RenderGrid>(*renderer).columnPositions() : downcast<RenderGrid>(*renderer).rowPositions();
</span><span class="cx"> // There are at least #tracks + 1 grid lines (trackPositions). Apart from that, the grid container can generate implicit grid tracks,
</span><span class="lines">@@ -1063,15 +1064,17 @@
</span><span class="cx"> addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, i, list.get());
</span><span class="cx"> list.get().append(zoomAdjustedPixelValue(trackPositions[i + 1] - trackPositions[i], style));
</span><span class="cx"> }
</span><ins>+ insertionIndex = trackPositions.size() - 1;
</ins><span class="cx"> } else {
</span><span class="cx"> for (unsigned i = 0; i < trackSizes.size(); ++i) {
</span><span class="cx"> addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, i, list.get());
</span><span class="cx"> list.get().append(specifiedValueForGridTrackSize(trackSizes[i], style));
</span><span class="cx"> }
</span><ins>+ insertionIndex = trackSizes.size();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Those are the trailing <ident>* allowed in the syntax.
</span><del>- addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, trackSizes.size(), list.get());
</del><ins>+ addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, insertionIndex, list.get());
</ins><span class="cx"> return WTF::move(list);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>