<!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>[196978] 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/196978">196978</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-23 08:49:54 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Rows track sizes are optional in grid-template shorthand
https://bugs.webkit.org/show_bug.cgi?id=154586
Reviewed by Sergio Villar Senin.
You can omit the size of the rows in grid-template shorthand,
even if you specify a named grid line for the end of the row,
due to a change in the spec back in 2014:
https://github.com/w3c/csswg-drafts/commit/9f660c4183c73c1f5279c46904dc6cb314f76194
Before if you want to specify a named grid line,
you need to set the row size.
Update parsing, so it nows accepts things like:
grid-template: 100px / "a" [bottom];
Source/WebCore:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns):
(WebCore::CSSParser::parseGridTemplateShorthand):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196977 => 196978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-23 16:30:50 UTC (rev 196977)
+++ trunk/LayoutTests/ChangeLog 2016-02-23 16:49:54 UTC (rev 196978)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-23 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Rows track sizes are optional in grid-template shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154586
+
+ Reviewed by Sergio Villar Senin.
+
+ You can omit the size of the rows in grid-template shorthand,
+ even if you specify a named grid line for the end of the row,
+ due to a change in the spec back in 2014:
+ https://github.com/w3c/csswg-drafts/commit/9f660c4183c73c1f5279c46904dc6cb314f76194
+
+ Before if you want to specify a named grid line,
+ you need to set the row size.
+
+ Update parsing, so it nows accepts things like:
+ grid-template: 100px / "a" [bottom];
+
</ins><span class="cx"> 2016-02-23 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> [SVG] Update SVG source to return string literals as ASCIILiteral and add test cases for case sensitivity
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt (196977 => 196978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt 2016-02-23 16:30:50 UTC (rev 196977)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set-expected.txt 2016-02-23 16:49:54 UTC (rev 196978)
</span><span class="lines">@@ -25,15 +25,27 @@
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 15px [tail]"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNames, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
</span><ins>+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 0px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesWithoutRowSize, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
</ins><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 15px [tail]"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumns, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b\""
</span><ins>+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-rows') is "[head] 0px [tail]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b\""
</ins><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-rows') is "[head1] 15px [tail1 head2] 20px [tail2]"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRows, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\" \"b\""
</span><ins>+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-rows') is "[head1] 0px [tail1 head2] 0px [tail2]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\" \"b\""
</ins><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "100px [nav nav2] 25px [nav nav2] 25px [last]"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
</span><ins>+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-columns') is "[first] 10px [nav nav2] 15px [nav nav2] 15px"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-rows') is "0px [nav nav2] 0px [nav nav2] 0px [last]"
+PASS window.getComputedStyle(gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes, '').getPropertyValue('-webkit-grid-template-areas') is "\"a b c\" \"d e f\" \"g h i\""
</ins><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormWithAuto, '').getPropertyValue('-webkit-grid-template-areas') is "\"a\""
</span><span class="lines">@@ -96,6 +108,12 @@
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize2, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><ins>+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize3, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridTemplateComplexFormMisplacedRowsSize4, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</ins><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridTemplateComplexFormColumnsNotParsing1, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html (196977 => 196978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2016-02-23 16:30:50 UTC (rev 196977)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2016-02-23 16:49:54 UTC (rev 196978)
</span><span class="lines">@@ -24,18 +24,33 @@
</span><span class="cx"> #gridTemplateComplexFormWithLineNames {
</span><span class="cx"> -webkit-grid-template: [head] "a" 15px [tail] / 10px;
</span><span class="cx"> }
</span><ins>+#gridTemplateComplexFormWithLineNamesWithoutRowSize {
+ -webkit-grid-template: [head] "a" [tail] / 10px;
+}
</ins><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleColumns {
</span><span class="cx"> -webkit-grid-template: [head] "a b" 15px [tail] / 10px;
</span><span class="cx"> }
</span><ins>+#gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize {
+ -webkit-grid-template: [head] "a b" [tail] / 10px;
+}
</ins><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleRows {
</span><span class="cx"> -webkit-grid-template: [head1] "a" 15px [tail1]
</span><span class="cx"> [head2] "b" 20px [tail2] / 10px;
</span><span class="cx"> }
</span><ins>+#gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes {
+ -webkit-grid-template: [head1] "a" [tail1]
+ [head2] "b" [tail2] / 10px;
+}
</ins><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns {
</span><span class="cx"> -webkit-grid-template: "a b c" 100px [nav]
</span><span class="cx"> [nav2] "d e f" 25px [nav]
</span><span class="cx"> [nav2] "g h i" 25px [last] / [first] 10px repeat(2, [nav nav2] 15px);
</span><span class="cx"> }
</span><ins>+#gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes {
+ -webkit-grid-template: "a b c" [nav]
+ [nav2] "d e f" [nav]
+ [nav2] "g h i" [last] / [first] 10px repeat(2, [nav nav2] 15px);
+}
</ins><span class="cx"> #gridTemplateComplexFormWithAuto {
</span><span class="cx"> -webkit-grid-template: "a" / 10px;
</span><span class="cx"> }
</span><span class="lines">@@ -99,6 +114,13 @@
</span><span class="cx"> #gridTemplateComplexFormMisplacedRowsSize2 {
</span><span class="cx"> -webkit-grid-template: "a" [name] 10px / 25px;
</span><span class="cx"> }
</span><ins>+#gridTemplateComplexFormMisplacedRowsSize3 {
+ -webkit-grid-template: [head] "a" [tail] 10px / 10px;
+}
+#gridTemplateComplexFormMisplacedRowsSize4 {
+ -webkit-grid-template: [head1] "a" [tail1]
+ [head2] "a" [tail2] 100px / 10px;
+}
</ins><span class="cx"> #gridTemplateComplexFormColumnsNotParsing1 {
</span><span class="cx"> -webkit-grid-template: "a" [name] 10px / a;
</span><span class="cx"> }
</span><span class="lines">@@ -126,9 +148,13 @@
</span><span class="cx"> <div class="grid" id="gridTemplateSimpleFormWithNone"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexForm"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithLineNames"></div>
</span><ins>+<div class="grid" id="gridTemplateComplexFormWithLineNamesWithoutRowSize"></div>
</ins><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumns"></div>
</span><ins>+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize"></div>
</ins><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRows"></div>
</span><ins>+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes"></div>
</ins><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns"></div>
</span><ins>+<div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes"></div>
</ins><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithAuto"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormOnlyAreas"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateNoColumnsRowWithEmptyTrailingLineNames"></div>
</span><span class="lines">@@ -151,6 +177,8 @@
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormNoColumnSize"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize1"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize2"></div>
</span><ins>+<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize3"></div>
+<div class="grid" id="gridTemplateComplexFormMisplacedRowsSize4"></div>
</ins><span class="cx"> <div class="grid" id="gridTemplateComplexFormColumnsNotParsing1"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormColumnsNotParsing2"></div>
</span><span class="cx"> <div class="grid" id="gridTemplateComplexFormWithNoneColumns"></div>
</span><span class="lines">@@ -167,9 +195,13 @@
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWithNone"), "none", "none", "none");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexForm"), "10px", "15px", '"a"');
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNames"), "10px", "[head] 15px [tail]", '"a"');
</span><ins>+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesWithoutRowSize"), "10px", "[head] 0px [tail]", '"a"');
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleColumns"), "10px", "[head] 15px [tail]", '"a b"');
</span><ins>+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleColumnsWithoutRowSize"), "10px", "[head] 0px [tail]", '"a b"');
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRows"), "10px", "[head1] 15px [tail1 head2] 20px [tail2]", '"a" "b"');
</span><ins>+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsWithoutRowsSizes"), "10px", "[head1] 0px [tail1 head2] 0px [tail2]", '"a" "b"');
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns"), "[first] 10px [nav nav2] 15px [nav nav2] 15px", "100px [nav nav2] 25px [nav nav2] 25px [last]", '"a b c" "d e f" "g h i"');
</span><ins>+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithLineNamesMultipleRowsAndColumnsWithoutRowsSizes"), "[first] 10px [nav nav2] 15px [nav nav2] 15px", "0px [nav nav2] 0px [nav nav2] 0px [last]", '"a b c" "d e f" "g h i"');
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithAuto"), "10px", "0px", '"a"');
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormOnlyAreas"), "none", "0px", '"a"');
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateNoColumnsRowWithEmptyTrailingLineNames"), "none", "[first] 0px", '"a"');
</span><span class="lines">@@ -193,6 +225,8 @@
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormNoColumnSize"), "none", "none", "none");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize1"), "none", "none", "none");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize2"), "none", "none", "none");
</span><ins>+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize3"), "none", "none", "none");
+ testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMisplacedRowsSize4"), "none", "none", "none");
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormColumnsNotParsing1"), "none", "none", "none");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormColumnsNotParsing2"), "none", "none", "none");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWithNoneColumns"), "none", "none", "none");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196977 => 196978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-23 16:30:50 UTC (rev 196977)
+++ trunk/Source/WebCore/ChangeLog 2016-02-23 16:49:54 UTC (rev 196978)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-23 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Rows track sizes are optional in grid-template shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154586
+
+ Reviewed by Sergio Villar Senin.
+
+ You can omit the size of the rows in grid-template shorthand,
+ even if you specify a named grid line for the end of the row,
+ due to a change in the spec back in 2014:
+ https://github.com/w3c/csswg-drafts/commit/9f660c4183c73c1f5279c46904dc6cb314f76194
+
+ Before if you want to specify a named grid line,
+ you need to set the row size.
+
+ Update parsing, so it nows accepts things like:
+ grid-template: 100px / "a" [bottom];
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns):
+ (WebCore::CSSParser::parseGridTemplateShorthand):
+
</ins><span class="cx"> 2016-02-23 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> [SVG] Update SVG source to return string literals as ASCIILiteral and add test cases for case sensitivity
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (196977 => 196978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-02-23 16:30:50 UTC (rev 196977)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-02-23 16:49:54 UTC (rev 196978)
</span><span class="lines">@@ -5606,7 +5606,7 @@
</span><span class="cx"> ++rowCount;
</span><span class="cx">
</span><span class="cx"> // Handle template-rows's track-size.
</span><del>- if (m_valueList->current() && !isForwardSlashOperator(*m_valueList->current()) && m_valueList->current()->unit != CSSParserValue::ValueList && m_valueList->current()->unit != CSSPrimitiveValue::CSS_STRING) {
</del><ins>+ if (m_valueList->current() && m_valueList->current()->unit != CSSParserValue::Operator && m_valueList->current()->unit != CSSParserValue::ValueList && m_valueList->current()->unit != CSSPrimitiveValue::CSS_STRING) {
</ins><span class="cx"> RefPtr<CSSValue> value = parseGridTrackSize(*m_valueList);
</span><span class="cx"> if (!value)
</span><span class="cx"> return false;
</span><span class="lines">@@ -5679,7 +5679,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- // 3- [<line-names>? <string> [<track-size> <line-names>]? ]+ syntax.
</del><ins>+ // 3- [<line-names>? <string> <track-size>? <line-names>? ]+ syntax.
</ins><span class="cx"> // It requires to rewind parsing due to previous syntax failures.
</span><span class="cx"> m_valueList->setCurrentIndex(0);
</span><span class="cx"> return parseGridTemplateRowsAndAreasAndColumns(important);
</span></span></pre>
</div>
</div>
</body>
</html>