<!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>[196906] 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/196906">196906</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-22 01:01:45 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Swap columns and rows in grid shorthand
https://bugs.webkit.org/show_bug.cgi?id=154449
Reviewed by Darin Adler.
The spec was modified past December to change the order of
columns and rows in the grid shorthand:
https://github.com/w3c/csswg-drafts/commit/7454c7c8c5857b61bbbe2ee5f07803c264bf37e4
Updated the parsing and modified the tests to follow the new syntax.
Source/WebCore:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridShorthand):
LayoutTests:
* fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
* fast/css-grid-layout/grid-shorthand-get-set.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridshorthandgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridshorthandgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-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 (196905 => 196906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-22 09:00:12 UTC (rev 196905)
+++ trunk/LayoutTests/ChangeLog 2016-02-22 09:01:45 UTC (rev 196906)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Swap columns and rows in grid shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154449
+
+ Reviewed by Darin Adler.
+
+ The spec was modified past December to change the order of
+ columns and rows in the grid shorthand:
+ https://github.com/w3c/csswg-drafts/commit/7454c7c8c5857b61bbbe2ee5f07803c264bf37e4
+
+ Updated the parsing and modified the tests to follow the new syntax.
+
+ * fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
+ * fast/css-grid-layout/grid-shorthand-get-set.html:
+
</ins><span class="cx"> 2016-02-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make HTMLSelectElement.size behave as per the specification
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridshorthandgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt (196905 => 196906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt 2016-02-22 09:00:12 UTC (rev 196905)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt 2016-02-22 09:01:45 UTC (rev 196906)
</span><span class="lines">@@ -28,18 +28,18 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
</span><span class="cx"> PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
</span><span class="cx"> PASS window.getComputedStyle(gridWithTemplateNone, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</span><del>-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowDenseAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</del><ins>+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoFlowDenseAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="lines">@@ -58,12 +58,12 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</span><del>-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
</del><ins>+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
+PASS window.getComputedStyle(gridWithAutoFlowAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</ins><span class="cx">
</span><span class="cx"> Test setting wrong values for 'grid' shorthand through CSS (they should resolve to the default: 'row')
</span><span class="cx"> PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
</span><span class="cx"> PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
</span><span class="cx"> PASS window.getComputedStyle(gridWithNone, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</span><del>-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoFlowNoneAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</del><ins>+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoFlowNoneAndRowsAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowNone, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="lines">@@ -214,10 +214,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateAreas is "initial"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is "column"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
-PASS element.style.webkitGridAutoColumns is "20px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS element.style.webkitGridAutoRows is "10px"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
+PASS element.style.webkitGridAutoColumns is "10px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
+PASS element.style.webkitGridAutoRows is "20px"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="lines">@@ -242,10 +242,10 @@
</span><span class="cx"> PASS element.style.webkitGridTemplateAreas is "initial"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is "column"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS element.style.webkitGridAutoColumns is "10px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
-PASS element.style.webkitGridAutoRows is "20px"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-columns') is "20px"
+PASS element.style.webkitGridAutoColumns is "20px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
+PASS element.style.webkitGridAutoRows is "10px"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS element.style.webkitGridTemplateColumns is "none"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridshorthandgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html (196905 => 196906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2016-02-22 09:00:12 UTC (rev 196905)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2016-02-22 09:01:45 UTC (rev 196906)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> #gridWithTemplateNone {
</span><span class="cx"> -webkit-grid: none / 10px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowDenseAndColumnsAndRows {
</del><ins>+#gridWithAutoFlowDenseAndRowsAndColumns {
</ins><span class="cx"> -webkit-grid: dense 10px / 20px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowAndColumns {
</del><ins>+#gridWithAutoFlowAndRows {
</ins><span class="cx"> -webkit-grid: column 10px;
</span><span class="cx"> }
</span><span class="cx"> #gridWithAutoFlowDense {
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #gridWithAutoFlowDenseRow {
</span><span class="cx"> -webkit-grid: dense row 10px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowAndColumnsAndRows {
</del><ins>+#gridWithAutoFlowAndRowsAndColumns {
</ins><span class="cx"> -webkit-grid: column 10px / 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #gridWithNone {
</span><span class="cx"> -webkit-grid: none;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowNoneAndColumnsAndRows {
</del><ins>+#gridWithAutoFlowNoneAndRowsAndColumns {
</ins><span class="cx"> -webkit-grid: none 10px / 20px;
</span><span class="cx"> }
</span><span class="cx"> #gridWithAutoFlowNone {
</span><span class="lines">@@ -94,15 +94,15 @@
</span><span class="cx"> <div class="grid" id="gridWithDense"></div>
</span><span class="cx"> <div class="grid" id="gridWithTemplate"></div>
</span><span class="cx"> <div class="grid" id="gridWithTemplate1"></div>
</span><del>-<div class="grid" id="gridWithAutoFlowDenseAndColumnsAndRows"></div>
-<div class="grid" id="gridWithAutoFlowAndColumns"></div>
</del><ins>+<div class="grid" id="gridWithAutoFlowDenseAndRowsAndColumns"></div>
+<div class="grid" id="gridWithAutoFlowAndRows"></div>
</ins><span class="cx"> <div class="grid" id="gridWithAutoFlowDense"></div>
</span><span class="cx"> <div class="grid" id="gridWithAutoFlowColumnDense"></div>
</span><span class="cx"> <div class="grid" id="gridWithAutoFlowDenseRow"></div>
</span><del>-<div class="grid" id="gridWithAutoFlowAndColumnsAndRows"></div>
</del><ins>+<div class="grid" id="gridWithAutoFlowAndRowsAndColumns"></div>
</ins><span class="cx"> <div class="grid" id="gridWithNone"></div>
</span><span class="cx"> <div class="grid" id="gridWithTemplateNone"></div>
</span><del>-<div class="grid" id="gridWithAutoFlowNoneAndColumnsAndRows"></div>
</del><ins>+<div class="grid" id="gridWithAutoFlowNoneAndRowsAndColumns"></div>
</ins><span class="cx"> <div class="grid" id="gridWithAutoFlowNone"></div>
</span><span class="cx"> <div class="grid" id="gridWithExplicitAndImplicit"></div>
</span><span class="cx"> <div class="grid" id="gridWithMisplacedNone1"></div>
</span><span class="lines">@@ -127,17 +127,17 @@
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithTemplate"), "15px", "10px", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithTemplate1"), "none", "10px", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithTemplateNone"), "none", "10px", "none", "row", "auto", "auto");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDenseAndColumnsAndRows"), "none", "none", "none", "row dense", "10px", "20px");
- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndColumns"), "none", "none", "none", "column", "10px", "10px");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDenseAndRowsAndColumns"), "none", "none", "none", "row dense", "20px", "10px");
+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndRows"), "none", "none", "none", "column", "10px", "10px");
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDense"), "none", "none", "none", "row dense", "10px", "10px");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowColumnDense"), "none", "none", "none", "column dense", "10px", "10px");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDenseRow"), "none", "none", "none", "row dense", "10px", "10px");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndColumnsAndRows"), "none", "none", "none", "column", "10px", "20px");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndRowsAndColumns"), "none", "none", "none", "column", "20px", "10px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting wrong values for 'grid' shorthand through CSS (they should resolve to the default: 'row')");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithNone"), "none", "none", "none", "row", "auto", "auto");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowNoneAndColumnsAndRows"), "none", "none", "none", "row", "auto", "auto");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowNoneAndRowsAndColumns"), "none", "none", "none", "row", "auto", "auto");
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowNone"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithExplicitAndImplicit"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithMisplacedNone1"), "none", "none", "none", "row", "auto", "auto");
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> testGridDefinitionsSetJSValues("10px / 20px", "10px", "20px", "none", "row", "auto", "auto", "10px", "20px", "none", "initial", "initial", "initial");
</span><span class="cx"> testGridDefinitionsSetJSValues("10px / [line] 'a' 20px", "10px", "[line] 20px", "\"a\"", "row", "auto", "auto", "10px", "[line] 20px", "\"a\"", "initial", "initial", "initial");
</span><span class="cx"> testGridDefinitionsSetJSValues("row dense 20px", "none", "none", "none", "row dense", "20px", "20px", "initial", "initial", "initial", "row dense", "20px", "20px");
</span><del>- testGridDefinitionsSetJSValues("column 20px / 10px", "none", "none", "none", "column", "20px", "10px", "initial", "initial", "initial", "column", "20px", "10px");
</del><ins>+ testGridDefinitionsSetJSValues("column 20px / 10px", "none", "none", "none", "column", "10px", "20px", "initial", "initial", "initial", "column", "10px", "20px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
</span><del>- testGridDefinitionsSetJSValues("column 10px / 20px", "none", "none", "none", "column", "10px", "20px", "initial", "initial", "initial", "column", "10px", "20px");
</del><ins>+ testGridDefinitionsSetJSValues("column 10px / 20px", "none", "none", "none", "column", "20px", "10px", "initial", "initial", "initial", "column", "20px", "10px");
</ins><span class="cx"> testGridDefinitionsSetJSValues("none", "none", "none", "none", "row", "auto", "auto", "none", "none", "none", "initial", "initial", "initial");
</span><span class="cx">
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196905 => 196906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-22 09:00:12 UTC (rev 196905)
+++ trunk/Source/WebCore/ChangeLog 2016-02-22 09:01:45 UTC (rev 196906)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Swap columns and rows in grid shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154449
+
+ Reviewed by Darin Adler.
+
+ The spec was modified past December to change the order of
+ columns and rows in the grid shorthand:
+ https://github.com/w3c/csswg-drafts/commit/7454c7c8c5857b61bbbe2ee5f07803c264bf37e4
+
+ Updated the parsing and modified the tests to follow the new syntax.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridShorthand):
+
</ins><span class="cx"> 2016-02-22 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Binding generator should support key value iterable
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (196905 => 196906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-02-22 09:00:12 UTC (rev 196905)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-02-22 09:01:45 UTC (rev 196906)
</span><span class="lines">@@ -5696,14 +5696,14 @@
</span><span class="cx"> RefPtr<CSSValue> autoRowsValue;
</span><span class="cx">
</span><span class="cx"> if (m_valueList->current()) {
</span><del>- autoColumnsValue = parseGridTrackSize(*m_valueList);
- if (!autoColumnsValue)
</del><ins>+ autoRowsValue = parseGridTrackSize(*m_valueList);
+ if (!autoRowsValue)
</ins><span class="cx"> return false;
</span><span class="cx"> if (m_valueList->current()) {
</span><span class="cx"> if (!isForwardSlashOperator(*m_valueList->current()) || !m_valueList->next())
</span><span class="cx"> return false;
</span><del>- autoRowsValue = parseGridTrackSize(*m_valueList);
- if (!autoRowsValue)
</del><ins>+ autoColumnsValue = parseGridTrackSize(*m_valueList);
+ if (!autoColumnsValue)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (m_valueList->current())
</span><span class="lines">@@ -5715,8 +5715,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // if <grid-auto-rows> value is omitted, it is set to the value specified for grid-auto-columns.
</span><del>- if (!autoRowsValue)
- autoRowsValue = autoColumnsValue;
</del><ins>+ if (!autoColumnsValue)
+ autoColumnsValue = autoRowsValue;
</ins><span class="cx">
</span><span class="cx"> addProperty(CSSPropertyWebkitGridAutoColumns, autoColumnsValue.release(), important);
</span><span class="cx"> addProperty(CSSPropertyWebkitGridAutoRows, autoRowsValue.release(), important);
</span></span></pre>
</div>
</div>
</body>
</html>