<!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>[200755] 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/200755">200755</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-05-12 02:12:13 -0700 (Thu, 12 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Incorrect parsing when using just 'span" as grid-line value
https://bugs.webkit.org/show_bug.cgi?id=157615
Reviewed by Sergio Villar Senin.
Source/WebCore:
The spec is pretty clear about this:
https://drafts.csswg.org/css-grid/#typedef-grid-row-start-grid-line
The possible options when using "span" to reference a grid line are:
[ span && [ <integer> || <custom-ident> ] ]
Thus, "span" keyword alone produces an invalid declaration.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridPosition):
LayoutTests:
Add new test case in grid-item-column-row-get-set.html.
Updated other tests that were using "span" alone, with 2 approaches:
- In some of them changing "span" by "span 1" making it valid.
- In other changing the expected result to "auto", as it's invalid now.
* fast/css-grid-layout/grid-item-area-get-set.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
* fast/css-grid-layout/grid-item-end-after-get-set.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
* fast/css-grid-layout/grid-item-start-before-get-set.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemareagetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnegativepositionresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-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 (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/ChangeLog 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-05-12 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Incorrect parsing when using just 'span" as grid-line value
+ https://bugs.webkit.org/show_bug.cgi?id=157615
+
+ Reviewed by Sergio Villar Senin.
+
+ Add new test case in grid-item-column-row-get-set.html.
+
+ Updated other tests that were using "span" alone, with 2 approaches:
+ - In some of them changing "span" by "span 1" making it valid.
+ - In other changing the expected result to "auto", as it's invalid now.
+
+ * fast/css-grid-layout/grid-item-area-get-set.html:
+ * fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
+ * fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
+ * fast/css-grid-layout/grid-item-column-row-get-set.html:
+ * fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
+ * fast/css-grid-layout/grid-item-end-after-get-set.html:
+ * fast/css-grid-layout/grid-item-negative-position-resolution.html:
+ * fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
+ * fast/css-grid-layout/grid-item-start-before-get-set.html:
+
</ins><span class="cx"> 2016-05-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: CRASH getting internal properties of function with no bound arguments causes
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemareagetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #threeValueGridArea {
</span><del>- grid-area: span / 10 / -1;
</del><ins>+ grid-area: span 1 / 10 / -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #fourValueGridArea {
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #fourValueMixedGridArea {
</span><del>- grid-area: firstArea / span / nonexistent / 1 foobar;
</del><ins>+ grid-area: firstArea / span 1 / nonexistent / 1 foobar;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> .namedGridLineSpanColumn {
</span><span class="cx"> grid-row: 1;
</span><del>- grid-column: nonExistentArea / span;
</del><ins>+ grid-column: nonExistentArea / span 1;
</ins><span class="cx"> background-color: lime;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -52,12 +52,12 @@
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row') is "3 / span 5"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row-start') is "3"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpanElement, '').getPropertyValue('grid-row-end') is "span 5"
</span><del>-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column') is "span 1 / span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-start') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-end') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row') is "span 1 / span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-start') is "span 1"
-PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-end') is "span 1"
</del><ins>+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItemWith2OnlySpanElement, '').getPropertyValue('grid-row-end') is "auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column') is "auto / auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column-start') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('grid-column-end') is "auto"
</span><span class="lines">@@ -170,6 +170,12 @@
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / 8"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "8"
</span><ins>+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
</ins><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "span 1 / 3"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "span 1"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "3"
</span><span class="lines">@@ -460,6 +466,18 @@
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
</span><ins>+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-start') is "auto"
+PASS getComputedStyle(gridItem, '').getPropertyValue('grid-row-end') is "auto"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> grid-row: firstArea;
</span><span class="cx"> }
</span><span class="cx"> .gridItemWithNamedGridAreaAndSpan {
</span><del>- grid-column: thirdArea / span;
</del><ins>+ grid-column: thirdArea / span 1;
</ins><span class="cx"> grid-row: firstArea / span 2;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNegativePositiveIntegerElement", "10 / -10", "-8 / 5");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithBeforeSpanElement", "span 2 / 4", "3 / span 5");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithAfterSpanElement", "span 2 / 4", "3 / span 5");
</span><del>- testColumnRowCSSParsing("gridItemWith2OnlySpanElement", "span 1 / span 1", "span 1 / span 1");
</del><ins>+ testColumnRowCSSParsing("gridItemWith2OnlySpanElement", "auto / auto", "auto / auto");
</ins><span class="cx"> testColumnRowCSSParsing("gridItemWith2AutoElement", "auto / auto" , "auto / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithBothShortLongHandElement", "10 / 11", "4 / 5");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNoSpaceElement", "auto / 1", "5 / auto");
</span><span class="lines">@@ -148,7 +148,8 @@
</span><span class="cx"> testColumnRowJSParsing("-5 / 5", "4 / -4");
</span><span class="cx"> testColumnRowJSParsing("4 / auto", "5 / auto");
</span><span class="cx"> testColumnRowJSParsing("auto / 5", "auto / 8");
</span><del>- testColumnRowJSParsing("span / 3", "5 / span", "span 1 / 3", "5 / span 1");
</del><ins>+ testColumnRowJSParsing("span / 3", "5 / span", "auto / auto", "auto / auto");
+ testColumnRowJSParsing("span 1 / 3", "5 / span 1", "span 1 / 3", "5 / span 1");
</ins><span class="cx"> testColumnRowJSParsing("first span / 3", "5 / last span", "span 1 first / 3", "5 / span 1 last");
</span><span class="cx"> testColumnRowJSParsing("first / last", "nav / last span", "first / last", "nav / span 1 last");
</span><span class="cx"> testColumnRowJSParsing("3 first / 2 last", "5 nav / last 7 span", "3 first / 2 last", "5 nav / span 7 last");
</span><span class="lines">@@ -201,6 +202,10 @@
</span><span class="cx"> testColumnRowInvalidJSParsing("6 / 0", "8 / 0");
</span><span class="cx"> testColumnRowInvalidJSParsing("0", "0");
</span><span class="cx">
</span><ins>+ // 'span' alone is invalid
+ testColumnRowInvalidJSParsing("span", "span");
+ testColumnRowInvalidJSParsing("span / span", "span / span");
+
</ins><span class="cx"> testColumnRowInvalidJSParsing("span span / span span", "span span / span span");
</span><span class="cx">
</span><span class="cx"> // More than 1 <integer> and / or <string>.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -34,12 +34,12 @@
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row') is "auto / span 9"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-start') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-end') is "span 9"
</span><del>-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "auto / span 1"
</del><ins>+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "auto / auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-start') is "auto"
</span><del>-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-end') is "span 1"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "auto / span 1"
</del><ins>+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-end') is "auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "auto / auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-start') is "auto"
</span><del>-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-end') is "span 1"
</del><ins>+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-end') is "auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column') is "auto / auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-start') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-end') is "auto"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNegativeInteger", "auto / -10", "auto / -15");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithBeforeSpan", "auto / span 2", "auto / span 9");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithAfterSpan", "auto / span 2", "auto / span 9");
</span><del>- testColumnRowCSSParsing("gridItemWithOnlySpan", "auto / span 1", "auto / span 1");
</del><ins>+ testColumnRowCSSParsing("gridItemWithOnlySpan", "auto / auto", "auto / auto");
</ins><span class="cx"> testColumnRowCSSParsing("gridItemWithAutoElement", "auto / auto", "auto / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithCustomIdent", "auto / first", "auto / last");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNumberCustomIdent", "auto / 2 first", "auto / 3 last");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnegativepositionresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .negativeEndPositionStartSpanInColumnDirection {
</span><del>- grid-column: span / -1;
</del><ins>+ grid-column: span 1 / -1;
</ins><span class="cx"> grid-row: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .negativeNamedGridLineEndPositionStartSpanInColumnDirection {
</span><del>- grid-column: span / last;
</del><ins>+ grid-column: span 1 / last;
</ins><span class="cx"> grid-row: 1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row') is "span 8 / auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-start') is "span 8"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAfterSpan, '').getPropertyValue('grid-row-end') is "auto"
</span><del>-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "span 1 / auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-start') is "span 1"
</del><ins>+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column') is "auto / auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-start') is "auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-column-end') is "auto"
</span><del>-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "span 1 / auto"
-PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-start') is "span 1"
</del><ins>+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row') is "auto / auto"
+PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-start') is "auto"
</ins><span class="cx"> PASS getComputedStyle(gridItemWithOnlySpan, '').getPropertyValue('grid-row-end') is "auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column') is "auto / auto"
</span><span class="cx"> PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('grid-column-start') is "auto"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNegativeInteger", "-10 / auto", "-15 / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithBeforeSpan", "span 2 / auto", "span 8 / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithAfterSpan", "span 2 / auto", "span 8 / auto");
</span><del>- testColumnRowCSSParsing("gridItemWithOnlySpan", "span 1 / auto", "span 1 / auto");
</del><ins>+ testColumnRowCSSParsing("gridItemWithOnlySpan", "auto / auto", "auto / auto");
</ins><span class="cx"> testColumnRowCSSParsing("gridItemWithAutoElement", "auto / auto", "auto / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithCustomIdent", "first / auto", "last / auto");
</span><span class="cx"> testColumnRowCSSParsing("gridItemWithNumberCustomIdent", "2 first / auto", "3 last / auto");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-12 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Incorrect parsing when using just 'span" as grid-line value
+ https://bugs.webkit.org/show_bug.cgi?id=157615
+
+ Reviewed by Sergio Villar Senin.
+
+ The spec is pretty clear about this:
+ https://drafts.csswg.org/css-grid/#typedef-grid-row-start-grid-line
+
+ The possible options when using "span" to reference a grid line are:
+ [ span && [ <integer> || <custom-ident> ] ]
+
+ Thus, "span" keyword alone produces an invalid declaration.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridPosition):
+
</ins><span class="cx"> 2016-05-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(ES6_ARROWFUNCTION_SYNTAX) guards
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (200754 => 200755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-12 09:12:12 UTC (rev 200754)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-12 09:12:13 UTC (rev 200755)
</span><span class="lines">@@ -5503,6 +5503,10 @@
</span><span class="cx"> if (!hasSeenSpanKeyword && !gridLineName && !numericValue)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ // If we have "span" keyword alone is invalid.
+ if (hasSeenSpanKeyword && !gridLineName && !numericValue)
+ return nullptr;
+
</ins><span class="cx"> // Negative numbers are not allowed for span (but are for <integer>).
</span><span class="cx"> if (hasSeenSpanKeyword && numericValue && numericValue->getIntValue() < 0)
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>