<!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>[196934] 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/196934">196934</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-22 06:08:41 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Swap columns and rows in grid-template shorthand
https://bugs.webkit.org/show_bug.cgi?id=154472
Reviewed by Darin Adler.
The spec was modified past December to change the order of
columns and rows in the grid-template shorthand:
https://github.com/w3c/csswg-drafts/commit/f6c7691679a519017a80ebae44fd86c3eae5c5f9
Updated the parsing and modified the tests to follow the new syntax.
Source/WebCore:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridTemplateColumns):
(WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns):
(WebCore::CSSParser::parseGridTemplateShorthand):
(WebCore::CSSParser::parseGridTemplateRowsAndAreas): Renamed to
parseGridTemplateRowsAndAreasAndColumns().
* css/CSSParser.h:
LayoutTests:
* fast/css-grid-layout/absolute-positioning-definite-sizes.html:
* fast/css-grid-layout/flex-content-distribution.html:
* fast/css-grid-layout/grid-align-content-vertical-lr.html:
* fast/css-grid-layout/grid-align-content-vertical-rl.html:
* fast/css-grid-layout/grid-align-content.html:
* fast/css-grid-layout/grid-gutters-and-alignment.html:
* fast/css-grid-layout/grid-gutters-and-flex-content.html:
* fast/css-grid-layout/grid-gutters-and-tracks.html:
* fast/css-grid-layout/grid-justify-content-vertical-lr.html:
* fast/css-grid-layout/grid-justify-content-vertical-rl.html:
* fast/css-grid-layout/grid-justify-content.html:
* fast/css-grid-layout/grid-shorthand-get-set.html:
* fast/css-grid-layout/grid-template-shorthand-get-set.html:
* fast/css-grid-layout/relayout-align-items-changed.html:
* fast/css-grid-layout/relayout-align-self-changed.html:
* fast/css-grid-layout/relayout-indefinite-heights.html:
* fast/css-grid-layout/relayout-justify-items-changed.html:
* fast/css-grid-layout/relayout-justify-self-changed.html:
* fast/repaint/align-items-overflow-change.html:
* fast/repaint/align-self-change.html:
* fast/repaint/align-self-overflow-change.html:
* fast/repaint/justify-items-change.html:
* fast/repaint/justify-items-overflow-change.html:
* fast/repaint/justify-self-change.html:
* fast/repaint/justify-self-overflow-change.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutabsolutepositioningdefinitesizeshtml">trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexcontentdistributionhtml">trunk/LayoutTests/fast/css-grid-layout/flex-content-distribution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridaligncontentverticallrhtml">trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridaligncontentverticalrlhtml">trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridaligncontenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-align-content.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandalignmenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandflexcontenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandtrackshtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridjustifycontentverticallrhtml">trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridjustifycontentverticalrlhtml">trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridjustifycontenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-justify-content.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridshorthandgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutrelayoutalignitemschangedhtml">trunk/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutrelayoutalignselfchangedhtml">trunk/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutrelayoutindefiniteheightshtml">trunk/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutrelayoutjustifyitemschangedhtml">trunk/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutrelayoutjustifyselfchangedhtml">trunk/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintalignitemsoverflowchangehtml">trunk/LayoutTests/fast/repaint/align-items-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintalignselfchangehtml">trunk/LayoutTests/fast/repaint/align-self-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintalignselfoverflowchangehtml">trunk/LayoutTests/fast/repaint/align-self-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyitemschangehtml">trunk/LayoutTests/fast/repaint/justify-items-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyitemsoverflowchangehtml">trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyselfchangehtml">trunk/LayoutTests/fast/repaint/justify-self-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyselfoverflowchangehtml">trunk/LayoutTests/fast/repaint/justify-self-overflow-change.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>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/ChangeLog 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><ins>+ [css-grid] Swap columns and rows in grid-template shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154472
+
+ Reviewed by Darin Adler.
+
+ The spec was modified past December to change the order of
+ columns and rows in the grid-template shorthand:
+ https://github.com/w3c/csswg-drafts/commit/f6c7691679a519017a80ebae44fd86c3eae5c5f9
+
+ Updated the parsing and modified the tests to follow the new syntax.
+
+ * fast/css-grid-layout/absolute-positioning-definite-sizes.html:
+ * fast/css-grid-layout/flex-content-distribution.html:
+ * fast/css-grid-layout/grid-align-content-vertical-lr.html:
+ * fast/css-grid-layout/grid-align-content-vertical-rl.html:
+ * fast/css-grid-layout/grid-align-content.html:
+ * fast/css-grid-layout/grid-gutters-and-alignment.html:
+ * fast/css-grid-layout/grid-gutters-and-flex-content.html:
+ * fast/css-grid-layout/grid-gutters-and-tracks.html:
+ * fast/css-grid-layout/grid-justify-content-vertical-lr.html:
+ * fast/css-grid-layout/grid-justify-content-vertical-rl.html:
+ * fast/css-grid-layout/grid-justify-content.html:
+ * fast/css-grid-layout/grid-shorthand-get-set.html:
+ * fast/css-grid-layout/grid-template-shorthand-get-set.html:
+ * fast/css-grid-layout/relayout-align-items-changed.html:
+ * fast/css-grid-layout/relayout-align-self-changed.html:
+ * fast/css-grid-layout/relayout-indefinite-heights.html:
+ * fast/css-grid-layout/relayout-justify-items-changed.html:
+ * fast/css-grid-layout/relayout-justify-self-changed.html:
+ * fast/repaint/align-items-overflow-change.html:
+ * fast/repaint/align-self-change.html:
+ * fast/repaint/align-self-overflow-change.html:
+ * fast/repaint/justify-items-change.html:
+ * fast/repaint/justify-items-overflow-change.html:
+ * fast/repaint/justify-self-change.html:
+ * fast/repaint/justify-self-overflow-change.html:
+
+2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
+
</ins><span class="cx"> [css-grid] Swap columns and rows in grid shorthand
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154449
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutabsolutepositioningdefinitesizeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/absolute-positioning-definite-sizes.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid-template: 1fr / 50px 1fr;
</del><ins>+ -webkit-grid-template: 50px 1fr / 1fr;
</ins><span class="cx">
</span><span class="cx"> position: absolute;
</span><span class="cx"> left: 50px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexcontentdistributionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-content-distribution.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-content-distribution.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-content-distribution.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx"> <link href="resources/grid-alignment.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .freeSpaceForColumnsGrid {
</span><del>- -webkit-grid-template: minmax(20px, 0.7fr) / 100%;
</del><ins>+ -webkit-grid-template: 100% / minmax(20px, 0.7fr);
</ins><span class="cx"> width: 50px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .freeSpaceForRowsGrid {
</span><del>- -webkit-grid-template: 100% / minmax(20px, 0.7fr);
</del><ins>+ -webkit-grid-template: minmax(20px, 0.7fr) / 100%;
</ins><span class="cx"> width: 50px;
</span><span class="cx"> height: 100px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridaligncontentverticallrhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 200px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridaligncontentverticalrlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 200px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridaligncontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-align-content.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandalignmenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid50And100 {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> position: relative; /* For the <p> comments */
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandflexcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -5,13 +5,13 @@
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx"> <style>
</span><del>-.gridMaxFlexContent { -webkit-grid-template: minmax(30px, 2fr) / 50px; }
-.gridTwoDoubleMaxFlexContent { -webkit-grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
-.gridIgnoreSecondGridItem { -webkit-grid-template: minmax(300px, 3fr) minmax(150px, 1fr) / 50px; }
</del><ins>+.gridMaxFlexContent { -webkit-grid-template: 50px / minmax(30px, 2fr); }
+.gridTwoDoubleMaxFlexContent { -webkit-grid-template: 50px / minmax(10px, 0.5fr) minmax(10px, 2fr); }
+.gridIgnoreSecondGridItem { -webkit-grid-template: 50px / minmax(300px, 3fr) minmax(150px, 1fr); }
</ins><span class="cx">
</span><del>-.gridRowsMaxFlexContent { -webkit-grid-template: 50px / minmax(30px, 2fr); }
-.gridRowsTwoMaxFlexContent { -webkit-grid-template: 50px / minmax(10px, 1fr) minmax(10px, 2fr); }
-.gridRowsTwoDoubleMaxFlexContent { -webkit-grid-template: 50px / minmax(10px, 0.5fr) minmax(10px, 2fr); }
</del><ins>+.gridRowsMaxFlexContent { -webkit-grid-template: minmax(30px, 2fr) / 50px; }
+.gridRowsTwoMaxFlexContent { -webkit-grid-template: minmax(10px, 1fr) minmax(10px, 2fr) / 50px; }
+.gridRowsTwoDoubleMaxFlexContent { -webkit-grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
</ins><span class="cx">
</span><span class="cx"> .gridMinMaxFlexFixedAndMinContentAndFixed { -webkit-grid-template-columns: minmax(0.5fr, 35px) -webkit-min-content 25px; }
</span><span class="cx"> .gridMinContentAndMinMaxFixedMinContentAndFlex { -webkit-grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandtrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> .gridMultipleCols { -webkit-grid-template-columns: 30px minmax(10px, 50px) 80px; }
</span><span class="cx"> .gridMultipleRows { -webkit-grid-template-rows: 90px 70px -webkit-min-content; }
</span><span class="cx"> .gridAutoAuto { -webkit-grid-template: auto auto / auto auto; }
</span><del>-.gridMultipleFixed { -webkit-grid-template: [first] 15px [foo] 25px [bar] 35px [last] / [first] 37px [foo] 57px [bar] 77px [last]; }
</del><ins>+.gridMultipleFixed { -webkit-grid-template: [first] 37px [foo] 57px [bar] 77px [last] / [first] 15px [foo] 25px [bar] 35px [last]; }
</ins><span class="cx"> .gridFixed100 { -webkit-grid-template: repeat(2, 100px) / repeat(2, 100px); }
</span><span class="cx">
</span><span class="cx"> .thirdRowThirdColumn { -webkit-grid-area: 3 / 3; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridjustifycontentverticallrhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-lr.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 200px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridjustifycontentverticalrlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-justify-content-vertical-rl.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 200px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridjustifycontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-justify-content.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-justify-content.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-justify-content.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px 50px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 50px 50px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridshorthandgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> -webkit-grid: dense;
</span><span class="cx"> }
</span><span class="cx"> #gridWithTemplate {
</span><del>- -webkit-grid: 15px / 10px;
</del><ins>+ -webkit-grid: 10px / 15px;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithTemplate1 {
</span><del>- -webkit-grid: none / 10px;
</del><ins>+ -webkit-grid: 10px / none;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithTemplateNone {
</span><del>- -webkit-grid: none / 10px;
</del><ins>+ -webkit-grid: 10px / none;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithAutoFlowDenseAndRowsAndColumns {
</span><span class="cx"> -webkit-grid: dense 10px / 20px;
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting 'grid' shorthand through JS");
</span><del>- testGridDefinitionsSetJSValues("10px / 20px", "10px", "20px", "none", "row", "auto", "auto", "10px", "20px", "none", "initial", "initial", "initial");
- testGridDefinitionsSetJSValues("10px / [line] 'a' 20px", "10px", "[line] 20px", "\"a\"", "row", "auto", "auto", "10px", "[line] 20px", "\"a\"", "initial", "initial", "initial");
</del><ins>+ testGridDefinitionsSetJSValues("20px / 10px", "10px", "20px", "none", "row", "auto", "auto", "10px", "20px", "none", "initial", "initial", "initial");
+ testGridDefinitionsSetJSValues("[line] 'a' 20px / 10px", "10px", "[line] 20px", "\"a\"", "row", "auto", "auto", "10px", "[line] 20px", "\"a\"", "initial", "initial", "initial");
</ins><span class="cx"> testGridDefinitionsSetJSValues("row dense 20px", "none", "none", "none", "row dense", "20px", "20px", "initial", "initial", "initial", "row dense", "20px", "20px");
</span><span class="cx"> testGridDefinitionsSetJSValues("column 20px / 10px", "none", "none", "none", "column", "10px", "20px", "initial", "initial", "initial", "column", "10px", "20px");
</span><span class="cx">
</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 (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -7,37 +7,37 @@
</span><span class="cx"> -webkit-grid-template: none;
</span><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleForm {
</span><del>- -webkit-grid-template: 10px / 15px;
</del><ins>+ -webkit-grid-template: 15px / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithNoneColumns {
</span><del>- -webkit-grid-template: none / 15px;
</del><ins>+ -webkit-grid-template: 15px / none;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithNoneRows {
</span><del>- -webkit-grid-template: 10px / none;
</del><ins>+ -webkit-grid-template: none / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithNone {
</span><span class="cx"> -webkit-grid-template: none / none;
</span><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexForm {
</span><del>- -webkit-grid-template: 10px / "a" 15px;
</del><ins>+ -webkit-grid-template: "a" 15px / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithLineNames {
</span><del>- -webkit-grid-template: 10px / [head] "a" 15px [tail];
</del><ins>+ -webkit-grid-template: [head] "a" 15px [tail] / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleColumns {
</span><del>- -webkit-grid-template: 10px / [head] "a b" 15px [tail]
</del><ins>+ -webkit-grid-template: [head] "a b" 15px [tail] / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleRows {
</span><del>- -webkit-grid-template: 10px / [head1] "a" 15px [tail1]
- [head2] "b" 20px [tail2];
</del><ins>+ -webkit-grid-template: [head1] "a" 15px [tail1]
+ [head2] "b" 20px [tail2] / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns {
</span><del>- -webkit-grid-template: [first] 10px repeat(2, [nav nav2] 15px) / "a b c" 100px [nav]
- [nav2] "d e f" 25px [nav]
- [nav2] "g h i" 25px [last];
</del><ins>+ -webkit-grid-template: "a b c" 100px [nav]
+ [nav2] "d e f" 25px [nav]
+ [nav2] "g h i" 25px [last] / [first] 10px repeat(2, [nav nav2] 15px);
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithAuto {
</span><del>- -webkit-grid-template: 10px / "a";
</del><ins>+ -webkit-grid-template: "a" / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormOnlyAreas {
</span><span class="cx"> -webkit-grid-template: "a";
</span><span class="lines">@@ -55,58 +55,58 @@
</span><span class="cx"> -webkit-grid-template: 10px;
</span><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormNoRows {
</span><del>- -webkit-grid-template: 10px /;
</del><ins>+ -webkit-grid-template: / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormNoColumns {
</span><del>- -webkit-grid-template: / 10px;
</del><ins>+ -webkit-grid-template: 10px /;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormNoColumnSize {
</span><del>- -webkit-grid-template: [line] / 10px;
</del><ins>+ -webkit-grid-template: 10px / [line];
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithFitContent {
</span><del>- -webkit-grid-template: -webkit-fit-content / 10px;
</del><ins>+ -webkit-grid-template: 10px / -webkit-fit-content;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithWrongRepeat {
</span><del>- -webkit-grid-template: repeat(2, 50% [title] a) / 10px;
</del><ins>+ -webkit-grid-template: 10px / repeat(2, 50% [title] a);
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithMisplacedNone1 {
</span><del>- -webkit-grid-template: 10px / none 20px;
</del><ins>+ -webkit-grid-template: none 20px / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithMisplacedNone2 {
</span><del>- -webkit-grid-template: 10px / 20px none;
</del><ins>+ -webkit-grid-template: 20px none / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithMisplacedNone3 {
</span><del>- -webkit-grid-template: none 10px / 20px;
</del><ins>+ -webkit-grid-template: 20px / none 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithMisplacedNone4 {
</span><del>- -webkit-grid-template: 10px none / 20px;
</del><ins>+ -webkit-grid-template: 20px / 10px none;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithRepeat {
</span><del>- -webkit-grid-template: 10px / "a" repeat(2, 50% [title]);
</del><ins>+ -webkit-grid-template: "a" repeat(2, 50% [title]) / 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithWrongRepeat {
</span><del>- -webkit-grid-template: repeat(2, 50% [title] a) / "a";
</del><ins>+ -webkit-grid-template: "a" / repeat(2, 50% [title] a);
</ins><span class="cx"> }
</span><span class="cx"> #griTemplateComplexFormdWithFitAvailable {
</span><del>- -webkit-grid-template: -webkit-fit-available / "a";
</del><ins>+ -webkit-grid-template: "a" / -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormNoColumnSize {
</span><del>- -webkit-grid-template: [line] / "a";
</del><ins>+ -webkit-grid-template: "a" / [line];
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormMisplacedRowsSize1 {
</span><del>- -webkit-grid-template: 25px / 10px "a";
</del><ins>+ -webkit-grid-template: 10px "a" / 25px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormMisplacedRowsSize2 {
</span><del>- -webkit-grid-template: 25px / "a" [name] 10px;
</del><ins>+ -webkit-grid-template: "a" [name] 10px / 25px;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormColumnsNotParsing1 {
</span><del>- -webkit-grid-template: a / "a" [name] 10px;
</del><ins>+ -webkit-grid-template: "a" [name] 10px / a;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormColumnsNotParsing2 {
</span><del>- -webkit-grid-template: "B" / "a" [name] 10px;
</del><ins>+ -webkit-grid-template: "a" [name] 10px / "B";
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateComplexFormWithNoneColumns {
</span><del>- -webkit-grid-template: none / "a" [name] 10px;
</del><ins>+ -webkit-grid-template: "a" [name] 10px / none;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames {
</span><span class="cx"> -webkit-grid-template: [first] "a" auto [] [];
</span><span class="lines">@@ -210,23 +210,23 @@
</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("10px / [line] 'a' 20px", "10px", "[line] 20px", "\"a\"");
</del><ins>+ testGridDefinitionsSetJSValues("[line] 'a' 20px / 10px", "10px", "[line] 20px", "\"a\"");
</ins><span class="cx"> testGridDefinitionsSetJSValues("none", "none", "none", "none");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting grid-template shorthand through JS");
</span><del>- testGridDefinitionsSetJSValues("18px / 66px", "18px", "66px", "none");
- testGridDefinitionsSetJSValues("10px / [head] 'a' 15px [tail]", "10px", "[head] 15px [tail]", "\"a\"");
</del><ins>+ testGridDefinitionsSetJSValues("66px / 18px", "18px", "66px", "none");
+ testGridDefinitionsSetJSValues("[head] 'a' 15px [tail] / 10px", "10px", "[head] 15px [tail]", "\"a\"");
</ins><span class="cx"> testGridDefinitionsSetJSValues("'a'", "none", "0px", "\"a\"", "none", "auto");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting grid-template shorthand to bad values through JS");
</span><del>- testGridDefinitionsSetBadJSValues("none / 'a'");
- testGridDefinitionsSetBadJSValues("25px / 'a' [name] 10px");
- testGridDefinitionsSetBadJSValues("'a' / 'b'");
</del><ins>+ testGridDefinitionsSetBadJSValues("'a' / none");
+ testGridDefinitionsSetBadJSValues("'a' [name] 10px / 25px");
+ testGridDefinitionsSetBadJSValues("'b' / 'a'");
</ins><span class="cx"> testGridDefinitionsSetBadJSValues("15px");
</span><del>- testGridDefinitionsSetBadJSValues("15px / 20px none");
- testGridDefinitionsSetBadJSValues("25px / 10px 'a'");
</del><ins>+ testGridDefinitionsSetBadJSValues("20px none / 15px");
+ testGridDefinitionsSetBadJSValues("10px 'a' / 25px");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutrelayoutalignitemschangedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/relayout-align-items-changed.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 100px 100px / 150px;
</del><ins>+ -webkit-grid: 150px / 100px 100px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> #fromStretch { align-items: stretch; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutrelayoutalignselfchangedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/relayout-align-self-changed.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 100px 100px / 150px;
</del><ins>+ -webkit-grid: 150px / 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutrelayoutindefiniteheightshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/relayout-indefinite-heights.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 50px / minmax(5px, 1fr) minmax(5px, 2fr);
</del><ins>+ -webkit-grid: minmax(5px, 1fr) minmax(5px, 2fr) / 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #fromIndefinite { height: auto; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutrelayoutjustifyitemschangedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/relayout-justify-items-changed.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 150px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 150px;
</ins><span class="cx"> width: 150px;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutrelayoutjustifyselfchangedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/css-grid-layout/relayout-justify-self-changed.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid: 150px / 100px 100px;
</del><ins>+ -webkit-grid: 100px 100px / 150px;
</ins><span class="cx"> width: 150px;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintalignitemsoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/align-items-overflow-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/align-items-overflow-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/align-items-overflow-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 200px / 150px 150px;
</del><ins>+ -webkit-grid: 150px 150px / 200px;
</ins><span class="cx"> align-items: end unsafe;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintalignselfchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/align-self-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/align-self-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/align-self-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 100px 100px / 300px;
</del><ins>+ -webkit-grid: 300px / 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintalignselfoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/align-self-overflow-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/align-self-overflow-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/align-self-overflow-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 200px / 150px 150px;
</del><ins>+ -webkit-grid: 150px 150px / 200px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyitemschangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-items-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-items-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/justify-items-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 200px / 300px;
</del><ins>+ -webkit-grid: 300px / 200px;
</ins><span class="cx"> justify-items: end;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyitemsoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 100px 100px / 300px;
</del><ins>+ -webkit-grid: 300px / 100px 100px;
</ins><span class="cx"> justify-items: end unsafe;
</span><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyselfchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-self-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-self-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/justify-self-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 100px 100px / 300px;
</del><ins>+ -webkit-grid: 300px / 100px 100px;
</ins><span class="cx"> justify-items: center;
</span><span class="cx"> width: 200px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyselfoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid: 100px 100px / 300px;
</del><ins>+ -webkit-grid: 300px / 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/Source/WebCore/ChangeLog 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><ins>+ [css-grid] Swap columns and rows in grid-template shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=154472
+
+ Reviewed by Darin Adler.
+
+ The spec was modified past December to change the order of
+ columns and rows in the grid-template shorthand:
+ https://github.com/w3c/csswg-drafts/commit/f6c7691679a519017a80ebae44fd86c3eae5c5f9
+
+ Updated the parsing and modified the tests to follow the new syntax.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridTemplateColumns):
+ (WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns):
+ (WebCore::CSSParser::parseGridTemplateShorthand):
+ (WebCore::CSSParser::parseGridTemplateRowsAndAreas): Renamed to
+ parseGridTemplateRowsAndAreasAndColumns().
+ * css/CSSParser.h:
+
+2016-02-22 Manuel Rego Casasnovas <rego@igalia.com>
+
</ins><span class="cx"> [css-grid] Swap columns and rows in grid shorthand
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154449
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -5565,10 +5565,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseGridTemplateRowsAndAreas(PassRefPtr<CSSValue> templateColumns, bool important)
</del><ins>+RefPtr<CSSValue> CSSParser::parseGridTemplateColumns()
</ins><span class="cx"> {
</span><ins>+ if (!(m_valueList->current() && isForwardSlashOperator(*m_valueList->current()) && m_valueList->next()))
+ return nullptr;
+ if (auto columnsValue = parseGridTrackList()) {
+ if (m_valueList->current())
+ return nullptr;
+ return columnsValue;
+ }
+
+ return nullptr;
+}
+
+bool CSSParser::parseGridTemplateRowsAndAreasAndColumns(bool important)
+{
</ins><span class="cx"> // At least template-areas strings must be defined.
</span><del>- if (!m_valueList->current())
</del><ins>+ if (!m_valueList->current() || isForwardSlashOperator(*m_valueList->current()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> NamedGridAreaMap gridAreaMap;
</span><span class="lines">@@ -5577,7 +5590,7 @@
</span><span class="cx"> bool trailingIdentWasAdded = false;
</span><span class="cx"> RefPtr<CSSValueList> templateRows = CSSValueList::createSpaceSeparated();
</span><span class="cx">
</span><del>- do {
</del><ins>+ while (m_valueList->current() && !isForwardSlashOperator(*m_valueList->current())) {
</ins><span class="cx"> // Handle leading <custom-ident>*.
</span><span class="cx"> if (m_valueList->current()->unit == CSSParserValue::ValueList) {
</span><span class="cx"> if (trailingIdentWasAdded) {
</span><span class="lines">@@ -5593,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() && m_valueList->current()->unit != CSSParserValue::ValueList && m_valueList->current()->unit != CSSPrimitiveValue::CSS_STRING) {
</del><ins>+ if (m_valueList->current() && !isForwardSlashOperator(*m_valueList->current()) && 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">@@ -5605,18 +5618,25 @@
</span><span class="cx"> trailingIdentWasAdded = false;
</span><span class="cx"> if (m_valueList->current() && m_valueList->current()->unit == CSSParserValue::ValueList)
</span><span class="cx"> trailingIdentWasAdded = parseGridLineNames(*m_valueList, *templateRows);
</span><del>- } while (m_valueList->current());
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // [<track-list> /]?
</span><del>- if (templateColumns)
- addProperty(CSSPropertyWebkitGridTemplateColumns, templateColumns, important);
- else
- addProperty(CSSPropertyWebkitGridTemplateColumns, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
</del><ins>+ RefPtr<CSSValue> templateColumns = nullptr;
+ if (m_valueList->current()) {
+ ASSERT(isForwardSlashOperator(*m_valueList->current()));
+ templateColumns = parseGridTemplateColumns();
+ if (!templateColumns)
+ return false;
+ // The template-columns <track-list> can't be 'none'.
+ if (templateColumns->isPrimitiveValue() && downcast<CSSPrimitiveValue>(*templateColumns).getValueID() == CSSValueNone)
+ return false;
+ }
</ins><span class="cx">
</span><del>- // [<line-names>? <string> [<track-size> <line-names>]? ]+
</del><ins>+ addProperty(CSSPropertyWebkitGridTemplateRows, templateRows.release(), important);
+ addProperty(CSSPropertyWebkitGridTemplateColumns, templateColumns ? templateColumns.release() : CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
+
</ins><span class="cx"> RefPtr<CSSValue> templateAreas = CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount);
</span><span class="cx"> addProperty(CSSPropertyWebkitGridTemplateAreas, templateAreas.release(), important);
</span><del>- addProperty(CSSPropertyWebkitGridTemplateRows, templateRows.release(), important);
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -5640,32 +5660,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned index = 0;
- RefPtr<CSSValue> columnsValue = firstValueIsNone ? CSSValuePool::singleton().createIdentifierValue(CSSValueNone) : parseGridTrackList();
</del><ins>+ // 2- <grid-template-rows> / <grid-template-columns> syntax.
+ RefPtr<CSSValue> rowsValue;
+ if (firstValueIsNone)
+ rowsValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
+ else
+ rowsValue = parseGridTrackList();
</ins><span class="cx">
</span><del>- // 2- <grid-template-columns> / <grid-template-columns> syntax.
- if (columnsValue) {
- if (!(m_valueList->current() && isForwardSlashOperator(*m_valueList->current()) && m_valueList->next()))
</del><ins>+ if (rowsValue) {
+ auto columnsValue = parseGridTemplateColumns();
+ if (!columnsValue)
</ins><span class="cx"> return false;
</span><del>- index = m_valueList->currentIndex();
- if (RefPtr<CSSValue> rowsValue = parseGridTrackList()) {
- if (m_valueList->current())
- return false;
- addProperty(CSSPropertyWebkitGridTemplateColumns, columnsValue.release(), important);
- addProperty(CSSPropertyWebkitGridTemplateRows, rowsValue.release(), important);
- addProperty(CSSPropertyWebkitGridTemplateAreas, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- return true;
- }
</del><ins>+
+ addProperty(CSSPropertyWebkitGridTemplateColumns, columnsValue.release(), important);
+ addProperty(CSSPropertyWebkitGridTemplateRows, rowsValue.release(), important);
+ addProperty(CSSPropertyWebkitGridTemplateAreas, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- // 3- [<track-list> /]? [<line-names>? <string> [<track-size> <line-names>]? ]+ syntax.
- // The template-columns <track-list> can't be 'none'.
- if (firstValueIsNone)
- return false;
</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><del>- m_valueList->setCurrentIndex(index);
- return parseGridTemplateRowsAndAreas(columnsValue, important);
</del><ins>+ m_valueList->setCurrentIndex(0);
+ return parseGridTemplateRowsAndAreasAndColumns(important);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSParser::parseGridShorthand(bool important)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (196933 => 196934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2016-02-22 11:49:09 UTC (rev 196933)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-02-22 14:08:41 UTC (rev 196934)
</span><span class="lines">@@ -210,7 +210,8 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> RefPtr<CSSValue> parseGridPosition();
</span><span class="cx"> bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
</span><del>- bool parseGridTemplateRowsAndAreas(PassRefPtr<CSSValue>, bool important);
</del><ins>+ RefPtr<CSSValue> parseGridTemplateColumns();
+ bool parseGridTemplateRowsAndAreasAndColumns(bool important);
</ins><span class="cx"> bool parseGridTemplateShorthand(bool important);
</span><span class="cx"> bool parseGridShorthand(bool important);
</span><span class="cx"> bool parseGridAreaShorthand(bool important);
</span></span></pre>
</div>
</div>
</body>
</html>