<!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>[177858] 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/177858">177858</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-01-02 02:01:11 -0800 (Fri, 02 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Remove stack from grid-auto-flow syntax
https://bugs.webkit.org/show_bug.cgi?id=134842
Reviewed by Sergio Villar Senin.
Source/WebCore:
"stack" mode for grid-auto-flow property has been removed from the grid
layout spec. New syntax is:
[ row | column ] || dense
Modified parsing in order to adapt it to the new syntax.
Also the current behavior relying on "stack" has been updated following
the spec. Now it won't be possible to mimic the old "none" (or "stack")
unless you specify manually the grid-placement properties.
No new tests needed, updated current tests to adapt them to the new
behavior.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue): Adapt to new syntax.
* css/CSSParser.cpp:
(WebCore::isValidGridAutoFlowId): Remove "stack" from valid ids.
(WebCore::CSSParser::parseGridAutoFlow): Adapt to new syntax.
* css/CSSValueKeywords.in: Remove "stack".
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty): Adapt to new syntax.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::placeItemsOnGrid): Remove old "stack" code.
* rendering/style/GridResolvedPosition.cpp:
(WebCore::GridResolvedPosition::resolveGridPositionsFromStyle): If we
cannot resolve positions, we have to run the auto-placement algorithm.
* rendering/style/RenderStyle.h: Remove "stack".
* rendering/style/RenderStyleConstants.h: Ditto.
LayoutTests:
Update layout tests in order to adapt the results to the new behavior.
* fast/css-grid-layout/grid-auto-flow-get-set-expected.txt:
* fast/css-grid-layout/grid-auto-flow-get-set.html:
* fast/css-grid-layout/grid-auto-flow-update.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-z-index-change-repaint.html:
* fast/css-grid-layout/grid-item-z-index-stacking-context.html:
* fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
* fast/css-grid-layout/grid-shorthand-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
* ietestcenter/css3/grid/grid-column-001.htm:
* ietestcenter/css3/grid/grid-column-002.htm:
* ietestcenter/css3/grid/grid-column-003.htm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnamedgridarearesolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemzindexchangerepainthtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemzindexstackingcontexthtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html</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="#trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasdynamicgetsethtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html</a></li>
<li><a href="#trunkLayoutTestsietestcentercss3gridgridcolumn001htm">trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001.htm</a></li>
<li><a href="#trunkLayoutTestsietestcentercss3gridgridcolumn002htm">trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm</a></li>
<li><a href="#trunkLayoutTestsietestcentercss3gridgridcolumn003htm">trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridResolvedPositioncpp">trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/ChangeLog 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-02 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Remove stack from grid-auto-flow syntax
+ https://bugs.webkit.org/show_bug.cgi?id=134842
+
+ Reviewed by Sergio Villar Senin.
+
+ Update layout tests in order to adapt the results to the new behavior.
+
+ * fast/css-grid-layout/grid-auto-flow-get-set-expected.txt:
+ * fast/css-grid-layout/grid-auto-flow-get-set.html:
+ * fast/css-grid-layout/grid-auto-flow-update.html:
+ * fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
+ * fast/css-grid-layout/grid-item-z-index-change-repaint.html:
+ * fast/css-grid-layout/grid-item-z-index-stacking-context.html:
+ * fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
+ * fast/css-grid-layout/grid-shorthand-get-set.html:
+ * fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html:
+ * fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
+ * ietestcenter/css3/grid/grid-column-001.htm:
+ * ietestcenter/css3/grid/grid-column-002.htm:
+ * ietestcenter/css3/grid/grid-column-003.htm:
+
</ins><span class="cx"> 2015-01-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> String includes methods perform toString on searchString before toInteger on a offset
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -6,15 +6,11 @@
</span><span class="cx"> Test getting -webkit-grid-auto-flow set through CSS
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumnSparse, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowRowSparse, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS window.getComputedStyle(gridAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</ins><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowRowDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowDenseColumn, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><del>-PASS window.getComputedStyle(gridAutoFlowStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
-PASS window.getComputedStyle(gridAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
-PASS window.getComputedStyle(gridAutoFlowStackRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
-PASS window.getComputedStyle(gridAutoFlowColumnStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
-PASS window.getComputedStyle(gridAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</del><span class="cx"> PASS window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx">
</span><span class="lines">@@ -22,12 +18,9 @@
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumns, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowRows, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><del>-PASS window.getComputedStyle(gridAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</del><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumnFoo, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumnColumn, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><del>-PASS window.getComputedStyle(gridAutoFlowDenseColumnStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowDenseRowStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS window.getComputedStyle(gridAutoFlowStackRowRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</del><ins>+PASS window.getComputedStyle(gridAutoFlowDenseRowRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is ''
</span><span class="lines">@@ -40,22 +33,14 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is 'row dense'
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row dense'
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</ins><span class="cx"> PASS element.style.webkitGridAutoFlow is 'column dense'
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is 'row dense'
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is 'row'
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><del>-PASS element.style.webkitGridAutoFlow is 'row stack'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
-PASS element.style.webkitGridAutoFlow is 'column stack'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
-PASS element.style.webkitGridAutoFlow is 'row stack'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
-PASS element.style.webkitGridAutoFlow is 'column stack'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
-PASS element.style.webkitGridAutoFlow is 'row stack'
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</del><span class="cx">
</span><span class="cx"> Test getting and setting bad values for -webkit-grid-auto-flow through JS
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is ''
</span><span class="lines">@@ -64,12 +49,6 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is ''
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><del>-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
-PASS element.style.webkitGridAutoFlow is ''
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</del><span class="cx">
</span><span class="cx"> Test setting -webkit-grid-auto-flow to 'initial' through JS
</span><span class="cx"> PASS element.style.webkitGridAutoFlow is 'initial'
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -3,6 +3,9 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><ins>+.gridAutoFlowDense {
+ -webkit-grid-auto-flow: dense;
+}
</ins><span class="cx"> .gridAutoFlowColumnDense {
</span><span class="cx"> -webkit-grid-auto-flow: column dense;
</span><span class="cx"> }
</span><span class="lines">@@ -15,18 +18,6 @@
</span><span class="cx"> .gridAutoFlowDenseRow {
</span><span class="cx"> -webkit-grid-auto-flow: dense row;
</span><span class="cx"> }
</span><del>-.gridAutoFlowStackColumn {
- -webkit-grid-auto-flow: stack column;
-}
-.gridAutoFlowStackRow {
- -webkit-grid-auto-flow: stack row;
-}
-.gridAutoFlowColumnStack {
- -webkit-grid-auto-flow: column stack;
-}
-.gridAutoFlowRowStack {
- -webkit-grid-auto-flow: row stack;
-}
</del><span class="cx"> .gridAutoFlowInherit {
</span><span class="cx"> -webkit-grid-auto-flow: inherit;
</span><span class="cx"> }
</span><span class="lines">@@ -40,24 +31,15 @@
</span><span class="cx"> .gridAutoFlowColumns {
</span><span class="cx"> -webkit-grid-auto-flow: columns;
</span><span class="cx"> }
</span><del>-.gridAutoFlowDense {
- -webkit-grid-auto-flow: dense;
-}
</del><span class="cx"> .gridAutoFlowColumnFoo {
</span><span class="cx"> -webkit-grid-auto-flow: column foo;
</span><span class="cx"> }
</span><span class="cx"> .gridAutoFlowColumnColumn {
</span><span class="cx"> -webkit-grid-auto-flow: column column;
</span><span class="cx"> }
</span><del>-.gridAutoFlowDenseColumnStack {
- -webkit-grid-auto-flow: dense column stack;
</del><ins>+.gridAutoFlowDenseRowRow {
+ -webkit-grid-auto-flow: dense row row;
</ins><span class="cx"> }
</span><del>-.gridAutoFlowDenseRowStack {
- -webkit-grid-auto-flow: dense row stack;
-}
-.gridAutoFlowStackRowRow {
- -webkit-grid-auto-flow: stack row row;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -65,15 +47,11 @@
</span><span class="cx"> <div class="grid" id="gridInitial"></div>
</span><span class="cx"> <div class="grid gridAutoFlowColumnSparse" id="gridAutoFlowColumnSparse"></div>
</span><span class="cx"> <div class="grid gridAutoFlowRowSparse" id="gridAutoFlowRowSparse"></div>
</span><ins>+<div class="grid gridAutoFlowDense" id="gridAutoFlowDense"></div>
</ins><span class="cx"> <div class="grid gridAutoFlowColumnDense" id="gridAutoFlowColumnDense"></div>
</span><span class="cx"> <div class="grid gridAutoFlowRowDense" id="gridAutoFlowRowDense"></div>
</span><span class="cx"> <div class="grid gridAutoFlowDenseColumn" id="gridAutoFlowDenseColumn"></div>
</span><span class="cx"> <div class="grid gridAutoFlowDenseRow" id="gridAutoFlowDenseRow"></div>
</span><del>-<div class="grid gridAutoFlowStack" id="gridAutoFlowStack"></div>
-<div class="grid gridAutoFlowStackColumn" id="gridAutoFlowStackColumn"></div>
-<div class="grid gridAutoFlowStackRow" id="gridAutoFlowStackRow"></div>
-<div class="grid gridAutoFlowColumnStack" id="gridAutoFlowColumnStack"></div>
-<div class="grid gridAutoFlowRowStack" id="gridAutoFlowRowStack"></div>
</del><span class="cx"> <div class="grid gridAutoFlowColumnSparse">
</span><span class="cx"> <div class="grid gridAutoFlowInherit" id="gridAutoFlowInherit"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -83,12 +61,9 @@
</span><span class="cx"> <div class="grid gridAutoFlowNone" id="gridAutoFlowNone"></div>
</span><span class="cx"> <div class="grid gridAutoFlowColumns" id="gridAutoFlowColumns"></div>
</span><span class="cx"> <div class="grid gridAutoFlowRows" id="gridAutoFlowRows"></div>
</span><del>-<div class="grid gridAutoFlowDense" id="gridAutoFlowDense"></div>
</del><span class="cx"> <div class="grid gridAutoFlowColumnFoo" id="gridAutoFlowColumnFoo"></div>
</span><span class="cx"> <div class="grid gridAutoFlowColumnColumn" id="gridAutoFlowColumnColumn"></div>
</span><del>-<div class="grid gridAutoFlowDenseColumnStack" id="gridAutoFlowDenseColumnStack"></div>
-<div class="grid gridAutoFlowDenseRowStack" id="gridAutoFlowDenseRowStack"></div>
-<div class="grid gridAutoFlowStackRowRow" id="gridAutoFlowStackRowRow"></div>
</del><ins>+<div class="grid gridAutoFlowDenseRowRow" id="gridAutoFlowDenseRowRow"></div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> description('Test that setting and getting -webkit-grid-auto-flow works as expected');
</span><span class="lines">@@ -96,15 +71,11 @@
</span><span class="cx"> debug("Test getting -webkit-grid-auto-flow set through CSS");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowColumnSparse", "column");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowRowSparse", "row");
</span><ins>+ checkGridAutoFlowSetCSSValue("gridAutoFlowDense", "row dense");
</ins><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowColumnDense", "column dense");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowRowDense", "row dense");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowDenseColumn", "column dense");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowDenseRow", "row dense");
</span><del>- checkGridAutoFlowSetCSSValue("gridAutoFlowStack", "row stack");
- checkGridAutoFlowSetCSSValue("gridAutoFlowStackColumn", "column stack");
- checkGridAutoFlowSetCSSValue("gridAutoFlowStackRow", "row stack");
- checkGridAutoFlowSetCSSValue("gridAutoFlowColumnStack", "column stack");
- checkGridAutoFlowSetCSSValue("gridAutoFlowRowStack", "row stack");
</del><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowInherit", "column");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowNoInherit", "row");
</span><span class="cx">
</span><span class="lines">@@ -113,12 +84,9 @@
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowNone", "row");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowColumns", "row");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowRows", "row");
</span><del>- checkGridAutoFlowSetCSSValue("gridAutoFlowDense", "row");
</del><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowColumnFoo", "row");
</span><span class="cx"> checkGridAutoFlowSetCSSValue("gridAutoFlowColumnColumn", "row");
</span><del>- checkGridAutoFlowSetCSSValue("gridAutoFlowDenseColumnStack", "row");
- checkGridAutoFlowSetCSSValue("gridAutoFlowDenseRowStack", "row");
- checkGridAutoFlowSetCSSValue("gridAutoFlowStackRowRow", "row");
</del><ins>+ checkGridAutoFlowSetCSSValue("gridAutoFlowDenseRowRow", "row");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="lines">@@ -128,24 +96,17 @@
</span><span class="cx"> debug("Test getting and setting -webkit-grid-auto-flow through JS");
</span><span class="cx"> checkGridAutoFlowSetJSValue("column", "column", "column");
</span><span class="cx"> checkGridAutoFlowSetJSValue("column dense", "column dense", "column dense");
</span><ins>+ checkGridAutoFlowSetJSValue("dense", "row dense", "row dense");
</ins><span class="cx"> checkGridAutoFlowSetJSValue("row dense", "row dense", "row dense");
</span><span class="cx"> checkGridAutoFlowSetJSValue("dense column", "column dense", "column dense");
</span><span class="cx"> checkGridAutoFlowSetJSValue("dense row", "row dense", "row dense");
</span><span class="cx"> checkGridAutoFlowSetJSValue("row", "row", "row");
</span><del>- checkGridAutoFlowSetJSValue("stack", "row stack", "row stack");
- checkGridAutoFlowSetJSValue("stack column", "column stack", "column stack");
- checkGridAutoFlowSetJSValue("stack row", "row stack", "row stack");
- checkGridAutoFlowSetJSValue("column stack", "column stack", "column stack");
- checkGridAutoFlowSetJSValue("row stack", "row stack", "row stack");
</del><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting bad values for -webkit-grid-auto-flow through JS");
</span><span class="cx"> checkGridAutoFlowSetJSValue("noone", "", "row");
</span><del>- checkGridAutoFlowSetJSValue("dense", "", "row");
</del><span class="cx"> checkGridAutoFlowSetJSValue("column column", "", "row");
</span><del>- checkGridAutoFlowSetJSValue("dense column stack", "", "row");
- checkGridAutoFlowSetJSValue("dense row stack", "", "row");
- checkGridAutoFlowSetJSValue("stack row row", "", "row");
</del><ins>+ checkGridAutoFlowSetJSValue("dense row row", "", "row");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting -webkit-grid-auto-flow to 'initial' through JS");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> checkLayout(".grid");
</span><span class="cx">
</span><span class="cx"> testGrid("column", { 'offsetX': '0', 'offsetY': '50', 'width': '50', 'height': '100' });
</span><del>- testGrid("stack", { 'offsetX': '0', 'offsetY': '0', 'width': '50', 'height': '50' });
</del><ins>+ testGrid("dense", { 'offsetX': '50', 'offsetY': '0', 'width': '100', 'height': '50' });
</ins><span class="cx"> testGrid("", { 'offsetX': '50', 'offsetY': '0', 'width': '100', 'height': '50' });
</span><span class="cx"> testGrid("invalid", { 'offsetX': '50', 'offsetY': '0', 'width': '100', 'height': '50' });
</span><span class="cx"> testGrid("none", { 'offsetX': '50', 'offsetY': '0', 'width': '100', 'height': '50' });
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnamedgridarearesolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -4,7 +4,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-rows: (before) 50px (middle) 100px (after);
</del><ins>+ -webkit-grid-template-rows: (before) 50px (middle) 100px (after) 150px;
</ins><span class="cx"> -webkit-grid-template-columns: 40px 80px 160px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <p>This test checks that we resolve named grid areas per the specification.</p>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridWithoutRepeat gridAutoFlowStack">
</del><ins>+ <div class="grid gridWithoutRepeat">
</ins><span class="cx"> <div class="sizedToGridArea gridItemSixthArea" data-offset-x="120" data-offset-y="50" data-expected-width="160" data-expected-height="100"></div>
</span><span class="cx"> <div class="sizedToGridArea gridItemFifthArea" data-offset-x="40" data-offset-y="50" data-expected-width="80" data-expected-height="100"></div>
</span><span class="cx"> <div class="sizedToGridArea gridItemFourthArea" data-offset-x="0" data-offset-y="50" data-expected-width="40" data-expected-height="100"></div>
</span><span class="lines">@@ -73,10 +73,10 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridWithRepeat gridAutoFlowStack">
</del><ins>+ <div class="grid gridWithRepeat">
</ins><span class="cx"> <!-- fifth and sixth are invalid named grid areas. -->
</span><del>- <div class="sizedToGridArea gridItemSixthArea" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="50"></div>
- <div class="sizedToGridArea gridItemFifthArea" data-offset-x="0" data-offset-y="0" data-expected-width="40" data-expected-height="50"></div>
</del><ins>+ <div class="sizedToGridArea gridItemSixthArea" data-offset-x="0" data-offset-y="150" data-expected-width="40" data-expected-height="150"></div>
+ <div class="sizedToGridArea gridItemFifthArea" data-offset-x="40" data-offset-y="150" data-expected-width="80" data-expected-height="150"></div>
</ins><span class="cx">
</span><span class="cx"> <div class="sizedToGridArea gridItemFourthArea" data-offset-x="0" data-offset-y="50" data-expected-width="120" data-expected-height="100"></div>
</span><span class="cx"> <div class="sizedToGridArea gridItemThirdArea" data-offset-x="120" data-offset-y="0" data-expected-width="160" data-expected-height="150"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemzindexchangerepainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-change-repaint.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> -webkit-grid-template-rows: 100px;
</span><span class="cx"> -webkit-grid-template-columns: 200px;
</span><span class="cx"> margin-top: 10px;
</span><del>- -webkit-grid-auto-flow: stack;
</del><span class="cx"> }
</span><span class="cx"> .red {
</span><span class="cx"> background-color: red;
</span><span class="lines">@@ -42,18 +41,18 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="item1" class="sizedToGridArea green negativeZIndex"></div>
- <div class="sizedToGridArea red"></div>
</del><ins>+ <div id="item1" class="sizedToGridArea green negativeZIndex firstRowFirstColumn"></div>
+ <div class="sizedToGridArea red firstRowFirstColumn"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="item2" class="sizedToGridArea green"></div>
- <div class="sizedToGridArea red"></div>
</del><ins>+ <div id="item2" class="sizedToGridArea green firstRowFirstColumn"></div>
+ <div class="sizedToGridArea red firstRowFirstColumn"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="grid3">
</span><del>- <div class="sizedToGridArea green"></div>
- <div id="item3" class="red negativeZIndex"></div>
</del><ins>+ <div class="sizedToGridArea green firstRowFirstColumn"></div>
+ <div id="item3" class="red negativeZIndex firstRowFirstColumn"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemzindexstackingcontexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-z-index-stacking-context.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> -webkit-grid-template-rows: 100px;
</span><span class="cx"> -webkit-grid-template-columns: 200px 200px;
</span><span class="cx"> margin-top: 10px;
</span><del>- -webkit-grid-auto-flow: stack;
</del><span class="cx"> }
</span><span class="cx"> .red {
</span><span class="cx"> background-color: red;
</span><span class="lines">@@ -28,13 +27,13 @@
</span><span class="cx"> <p>For this test to pass, there should be no red below.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div class="sizedToGridArea green positiveZIndex"></div>
- <div class="sizedToGridArea red"></div>
</del><ins>+ <div class="sizedToGridArea green positiveZIndex firstRowFirstColumn"></div>
+ <div class="sizedToGridArea red firstRowFirstColumn"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div class="sizedToGridArea green"></div>
- <div class="sizedToGridArea red negativeZIndex"></div>
</del><ins>+ <div class="sizedToGridArea green firstRowFirstColumn"></div>
+ <div class="sizedToGridArea red negativeZIndex firstRowFirstColumn"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</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 (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Test getting the longhand values when shorthand is set through CSS.
</span><del>-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-auto-flow') is "row stack"
-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithStack, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</del><ins>+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
+PASS window.getComputedStyle(gridWithDense, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-columns') is "15px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-rows') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithTemplate, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="lines">@@ -28,24 +28,24 @@
</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(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-flow') is "row stack"
-PASS window.getComputedStyle(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowStackAndColumnsAndRows, '').getPropertyValue('-webkit-grid-auto-rows') is "20px"
</del><ins>+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"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-flow') is "column"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumns, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</span><del>-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-auto-flow') is "row stack"
-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowStack, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</del><ins>+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row dense"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
+PASS window.getComputedStyle(gridWithAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="lines">@@ -58,18 +58,6 @@
</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(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-auto-flow') is "column stack"
-PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-flow') is "row stack"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-columns') is "10px"
-PASS window.getComputedStyle(gridWithAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-rows') is "10px"
</del><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoFlowAndColumnsAndRows, '').getPropertyValue('-webkit-grid-template-areas') is "none"
</span><span class="lines">@@ -120,12 +108,6 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
</span><span class="cx"> PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
</span><span class="cx"> PASS window.getComputedStyle(gridWithMisplacedDense, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</span><del>-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-template-columns') is "none"
-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-template-rows') is "none"
-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-template-areas') is "none"
-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-auto-flow') is "row"
-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-auto-columns') is "auto"
-PASS window.getComputedStyle(gridWithMisplacedStack, '').getPropertyValue('-webkit-grid-auto-rows') is "auto"
</del><span class="cx"> PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithWrongSlash1, '').getPropertyValue('-webkit-grid-template-areas') 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 (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><del>-#gridWithStack {
- -webkit-grid: stack;
</del><ins>+#gridWithDense {
+ -webkit-grid: dense;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithTemplate {
</span><span class="cx"> -webkit-grid: 15px / 10px;
</span><span class="lines">@@ -15,14 +15,14 @@
</span><span class="cx"> #gridWithTemplateNone {
</span><span class="cx"> -webkit-grid: none / 10px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowStackAndColumnsAndRows {
- -webkit-grid: stack 10px / 20px;
</del><ins>+#gridWithAutoFlowDenseAndColumnsAndRows {
+ -webkit-grid: dense 10px / 20px;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithAutoFlowAndColumns {
</span><span class="cx"> -webkit-grid: column 10px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowStack {
- -webkit-grid: stack 10px;
</del><ins>+#gridWithAutoFlowDense {
+ -webkit-grid: dense 10px;
</ins><span class="cx"> }
</span><span class="cx"> #gridWithAutoFlowColumnDense {
</span><span class="cx"> -webkit-grid: column dense 10px;
</span><span class="lines">@@ -30,12 +30,6 @@
</span><span class="cx"> #gridWithAutoFlowDenseRow {
</span><span class="cx"> -webkit-grid: dense row 10px;
</span><span class="cx"> }
</span><del>-#gridWithAutoFlowStackColumn {
- -webkit-grid: stack column 10px;
-}
-#gridWithAutoFlowRowStack {
- -webkit-grid: row stack 10px;
-}
</del><span class="cx"> #gridWithAutoFlowAndColumnsAndRows {
</span><span class="cx"> -webkit-grid: column 10px / 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -93,23 +87,18 @@
</span><span class="cx"> #gridWithMisplacedDense {
</span><span class="cx"> -webkit-grid: dense column dense;
</span><span class="cx"> }
</span><del>-#gridWithMisplacedStack {
- -webkit-grid: stack row stack;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div class="grid" id="gridWithStack"></div>
</del><ins>+<div class="grid" id="gridWithDense"></div>
</ins><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="gridWithAutoFlowStackAndColumnsAndRows"></div>
</del><ins>+<div class="grid" id="gridWithAutoFlowDenseAndColumnsAndRows"></div>
</ins><span class="cx"> <div class="grid" id="gridWithAutoFlowAndColumns"></div>
</span><del>-<div class="grid" id="gridWithAutoFlowStack"></div>
</del><ins>+<div class="grid" id="gridWithAutoFlowDense"></div>
</ins><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="gridWithAutoFlowStackColumn"></div>
-<div class="grid" id="gridWithAutoFlowRowStack"></div>
</del><span class="cx"> <div class="grid" id="gridWithAutoFlowAndColumnsAndRows"></div>
</span><span class="cx"> <div class="grid" id="gridWithNone"></div>
</span><span class="cx"> <div class="grid" id="gridWithTemplateNone"></div>
</span><span class="lines">@@ -129,23 +118,20 @@
</span><span class="cx"> <div class="grid" id="gridWithTemplateAndAutoFlow"></div>
</span><span class="cx"> <div class="grid" id="gridWithTemplateAndMisplacedString1"></div>
</span><span class="cx"> <div class="grid" id="gridWithMisplacedDense"></div>
</span><del>-<div class="grid" id="gridWithMisplacedStack"></div>
</del><span class="cx"> <script src="resources/grid-shorthand-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> description("This test checks that the 'grid' shorthand is properly parsed and the longhand properties correctly assigned.");
</span><span class="cx">
</span><span class="cx"> debug("Test getting the longhand values when shorthand is set through CSS.");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithStack"), "none", "none", "none", "row stack", "auto", "auto");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithDense"), "none", "none", "none", "row dense", "auto", "auto");
</ins><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("gridWithAutoFlowStackAndColumnsAndRows"), "none", "none", "none", "row stack", "10px", "20px");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDenseAndColumnsAndRows"), "none", "none", "none", "row dense", "10px", "20px");
</ins><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndColumns"), "none", "none", "none", "column", "10px", "10px");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowStack"), "none", "none", "none", "row stack", "10px", "10px");
</del><ins>+ testGridDefinitionsValues(document.getElementById("gridWithAutoFlowDense"), "none", "none", "none", "row dense", "10px", "10px");
</ins><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("gridWithAutoFlowStackColumn"), "none", "none", "none", "column stack", "10px", "10px");
- testGridDefinitionsValues(document.getElementById("gridWithAutoFlowRowStack"), "none", "none", "none", "row stack", "10px", "10px");
</del><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithAutoFlowAndColumnsAndRows"), "none", "none", "none", "column", "10px", "20px");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -157,7 +143,6 @@
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithMisplacedNone1"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithMisplacedNone2"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithMisplacedDense"), "none", "none", "none", "row", "auto", "auto");
</span><del>- testGridDefinitionsValues(document.getElementById("gridWithMisplacedStack"), "none", "none", "none", "row", "auto", "auto");
</del><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithWrongSlash1"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithWrongSlash2"), "none", "none", "none", "row", "auto", "auto");
</span><span class="cx"> testGridDefinitionsValues(document.getElementById("gridWithWrongSlash3"), "none", "none", "none", "row", "auto", "auto");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasdynamicgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-dynamic-get-set.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> var gridContainer = document.getElementById("gridContainer");
</span><span class="cx"> var gridElement = document.createElement("div");
</span><span class="cx"> gridElement.className = "grid";
</span><del>- gridElement.style.webkitGridAutoFlow = "stack";
</del><ins>+ gridElement.style.webkitGridAutoFlow = "dense";
</ins><span class="cx">
</span><span class="cx"> for (var key in gridDefinitions) {
</span><span class="cx"> if (key == "rows")
</span><span class="lines">@@ -62,14 +62,14 @@
</span><span class="cx"> // Check grid area resolution.
</span><span class="cx"> var gridAreasItems = [ { 'column': 'd', 'x': '150', 'y': '0', 'width': '200', 'height': '50' },
</span><span class="cx"> { 'column': 'c', 'x': '0', 'y': '0', 'width': '50', 'height': '50' },
</span><del>- { 'column': 'a', 'x': '50', 'y': '0', 'width': '300', 'height': '50' }];
</del><ins>+ { 'column': 'a', 'x': '50', 'y': '50', 'width': '300', 'height': '100' }];
</ins><span class="cx">
</span><span class="cx"> testLayout({ 'columns': columnNoNames, 'rows': rowNoNames, 'areas': templateAreaOne }, gridAreasItems);
</span><span class="cx"> testLayout({ 'areas': templateAreaOne, 'columns': columnNoNames, 'rows': rowNoNames }, gridAreasItems);
</span><span class="cx"> testLayout({ 'columns': columnNoNames, 'areas': templateAreaOne, 'rows': rowNoNames }, gridAreasItems);
</span><span class="cx">
</span><span class="cx"> var gridAreasItemsTwo = [ { 'column': 'd', 'x': '50', 'y': '0', 'width': '300', 'height': '50' },
</span><del>- { 'column': 'c', 'x': '150', 'y': '0', 'width': '200', 'height': '50' },
</del><ins>+ { 'column': 'c', 'x': '150', 'y': '50', 'width': '200', 'height': '100' },
</ins><span class="cx"> { 'column': 'a', 'x': '0', 'y': '0', 'width': '50', 'height': '50' }];
</span><span class="cx">
</span><span class="cx"> testLayout({ 'areas': templateAreaTwo, 'areas': templateAreaOne, 'columns': columnNoNames, 'rows': rowNoNames }, gridAreasItems);
</span><span class="lines">@@ -100,18 +100,18 @@
</span><span class="cx"> testLayout({ 'columns': columnNoNames, 'rows': rowNoNames, 'areas': templateAreaOne, 'areas': templateAreaTwo }, implicitNamesItemsTwo);
</span><span class="cx">
</span><span class="cx"> // Check resolution when named lines are defined before the grid area.
</span><del>- var itemsBeforeArea = [ { 'column': 'd', 'x': '50', 'y': '0', 'width': '300', 'height': '50' },
- { 'row': 'c', 'x': '0', 'y': '0', 'width': '50', 'height': '150'},
- { 'column': 'd-start', 'x': '50', 'y': '0', 'width': '100', 'height': '50' },
</del><ins>+ var itemsBeforeArea = [ { 'column': 'd', 'x': '50', 'y': '150', 'width': '300', 'height': '200' },
+ { 'row': 'c', 'x': '50', 'y': '0', 'width': '100', 'height': '150'},
+ { 'column': 'd-start', 'x': '50', 'y': '350', 'width': '100', 'height': '0' },
</ins><span class="cx"> { 'column': 'a-start', 'row': 'd', 'x': '0', 'y': '50', 'width': '50', 'height': '300' } ];
</span><span class="cx">
</span><span class="cx"> testLayout({ 'columns': columnNamedLineBeforeArea, 'rows': rowNamedLineBeforeArea, 'areas': templateAreaOne }, itemsBeforeArea);
</span><span class="cx"> testLayout({ 'areas': templateAreaOne, 'columns': columnNamedLineBeforeArea, 'rows': rowNamedLineBeforeArea }, itemsBeforeArea);
</span><span class="cx"> testLayout({ 'columns': columnNamedLineBeforeArea, 'areas': templateAreaOne, 'rows': rowNamedLineBeforeArea }, itemsBeforeArea);
</span><span class="cx">
</span><del>- var itemsBeforeAreaTwo = [ { 'column': 'd', 'x': '50', 'y': '0', 'width': '300', 'height': '50' },
- { 'row': 'c', 'x': '0', 'y': '0', 'width': '50', 'height': '350'},
- { 'column': 'd-start', 'x': '50', 'y': '0', 'width': '100', 'height': '50' },
</del><ins>+ var itemsBeforeAreaTwo = [ { 'column': 'd', 'x': '50', 'y': '350', 'width': '300', 'height': '0' },
+ { 'row': 'c', 'x': '50', 'y': '0', 'width': '100', 'height': '350'},
+ { 'column': 'd-start', 'x': '50', 'y': '350', 'width': '100', 'height': '0' },
</ins><span class="cx"> { 'column': 'a-start', 'row': 'd', 'x': '0', 'y': '0', 'width': '50', 'height': '150' } ];
</span><span class="cx">
</span><span class="cx"> testLayout({ 'areas': templateAreaTwo, 'areas': templateAreaOne, 'columns': columnNamedLineBeforeArea, 'rows': rowNamedLineBeforeArea }, itemsBeforeArea);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx">
</span><span class="cx"> <!-- Check positioning using unique grid-line names -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridUniqueNames gridAutoFlowStack">
</del><ins>+ <div class="grid gridUniqueNames">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: b;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: e;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</span><del>- <div class="sizedToGridArea" style="-webkit-grid-column: b-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
</del><ins>+ <div class="sizedToGridArea" style="-webkit-grid-column: b-start;" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100"></div>
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: g-start;" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="200"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -88,11 +88,11 @@
</span><span class="cx">
</span><span class="cx"> <!-- Check that without named gridAreas there are no implicit grid-line names defined -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridUniqueNames gridAutoFlowStack">
</del><ins>+ <div class="grid gridUniqueNames">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: c-start;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</span><del>- <div class="sizedToGridArea" style="-webkit-grid-row: f-start;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: c-start; -webkit-grid-row: f-end" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: b-end; -webkit-grid-row: h-start" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</del><ins>+ <div class="sizedToGridArea" style="-webkit-grid-row: f-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="-webkit-grid-column: c-start; -webkit-grid-row: f-end" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="-webkit-grid-column: b-end; -webkit-grid-row: h-start" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreas gridNoLineNames gridAutoFlowStack">
- <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
</del><ins>+ <div class="grid gridAreas gridNoLineNames">
+ <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="150"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -150,11 +150,11 @@
</span><span class="cx">
</span><span class="cx"> <!-- Use explicitly named grid lines if they're defined before the grid area -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreas gridWithNamedLineBeforeGridArea gridAutoFlowStack">
- <div class="sizedToGridArea" style="-webkit-grid-column: d;" data-offset-x="50" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
</del><ins>+ <div class="grid gridAreas gridWithNamedLineBeforeGridArea">
+ <div class="sizedToGridArea" style="-webkit-grid-column: d;" data-offset-x="50" data-offset-y="150" data-expected-width="300" data-expected-height="200"></div>
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
</span><del>- <div class="sizedToGridArea" style="-webkit-grid-column: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-row: c;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div>
</del><ins>+ <div class="sizedToGridArea" style="-webkit-grid-column: c;" data-offset-x="0" data-offset-y="350" data-expected-width="50" data-expected-height="0"></div>
+ <div class="sizedToGridArea" style="-webkit-grid-row: c;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -166,9 +166,9 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreas gridWithNamedLineBeforeGridArea gridAutoFlowStack">
</del><ins>+ <div class="grid gridAreas gridWithNamedLineBeforeGridArea">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="50"></div>
</span><del>- <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="300"></div>
</del><ins>+ <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="350" data-offset-y="50" data-expected-width="0" data-expected-height="300"></div>
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="300"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -204,10 +204,10 @@
</span><span class="cx">
</span><span class="cx"> <!-- Check behavior with areas named *-start or *-end -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreasSpecial gridNoLineNames gridAutoFlowStack">
</del><ins>+ <div class="grid gridAreasSpecial gridNoLineNames">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</span><del>- <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
- <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</del><ins>+ <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsietestcentercss3gridgridcolumn001htm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001.htm (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001.htm 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001.htm 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -74,13 +74,26 @@
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> grid-row: 1;
</span><span class="cx"> }
</span><ins>+ #row1column1
+ {
+ -ms-grid-column: 1;
+ -moz-grid-column: 1;
+ -o-grid-column: 1;
+ -webkit-grid-column: 1;
+ grid-column: 1;
+ -ms-grid-row: 1;
+ -moz-grid-row: 1;
+ -o-grid-row: 1;
+ -webkit-grid-row: 1;
+ grid-row: 1;
+ }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Test passes if there is no red visible on the page.</p>
</span><span class="cx"> <div id="test">
</span><span class="cx"> <div id="griditem">XXXX</div>
</span><del>- <div>XXXXX</div>
</del><ins>+ <div id="row1column1">XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsietestcentercss3gridgridcolumn002htm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -34,15 +34,22 @@
</span><span class="cx"> <meta name="flags" content="ahem invalid" />
</span><span class="cx"> <meta name="assert" content="The 'grid-column' with a value of '0' is invalid and inserts the grid-item in the first column." />
</span><span class="cx"> <style type="text/css">
</span><ins>+ #container
+ {
+ position: relative;
+ color: green;
+ font: 20px/1 ahem;
+ }
</ins><span class="cx"> #test
</span><span class="cx"> {
</span><del>- color: green;
</del><ins>+ position: absolute;
+ left: 0;
+ top: 0;
</ins><span class="cx"> display: -ms-grid;
</span><span class="cx"> display: -moz-grid;
</span><span class="cx"> display: -o-grid;
</span><span class="cx"> display: -webkit-grid;
</span><span class="cx"> display: grid;
</span><del>- font: 20px/1 ahem;
</del><span class="cx"> height: 3em;
</span><span class="cx"> -ms-grid-columns: auto 1fr;
</span><span class="cx"> -moz-grid-columns: auto 1fr;
</span><span class="lines">@@ -74,13 +81,20 @@
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> grid-row: 1;
</span><span class="cx"> }
</span><ins>+ #absolute {
+ position: absolute;
+ left: 0;
+ top: 0;
+ }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Test passes if there is no red visible on the page.</p>
</span><del>- <div id="test">
- <div id="griditem">XXXX</div>
- <div>XXXXX</div>
</del><ins>+ <div id="container">
+ <div id="test">
+ <div id="griditem">XXXX</div>
+ </div>
+ <div id="absolute">XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsietestcentercss3gridgridcolumn003htm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -74,6 +74,19 @@
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> grid-row: 1;
</span><span class="cx"> }
</span><ins>+ #row1column1
+ {
+ -ms-grid-column: 1;
+ -moz-grid-column: 1;
+ -o-grid-column: 1;
+ -webkit-grid-column: 1;
+ grid-column: 1;
+ -ms-grid-row: 1;
+ -moz-grid-row: 1;
+ -o-grid-row: 1;
+ -webkit-grid-row: 1;
+ grid-row: 1;
+ }
</ins><span class="cx"> span
</span><span class="cx"> {
</span><span class="cx"> color: red;
</span><span class="lines">@@ -83,7 +96,7 @@
</span><span class="cx"> <body>
</span><span class="cx"> <p>Test passes if there is no red visible on the page.</p>
</span><span class="cx"> <div id="test">
</span><del>- <div><span>XX</span>X<span>XX</span></div>
</del><ins>+ <div id="row1column1"><span>XX</span>X<span>XX</span></div>
</ins><span class="cx"> <div id="griditem">XX XX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/ChangeLog 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-01-02 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Remove stack from grid-auto-flow syntax
+ https://bugs.webkit.org/show_bug.cgi?id=134842
+
+ Reviewed by Sergio Villar Senin.
+
+ "stack" mode for grid-auto-flow property has been removed from the grid
+ layout spec. New syntax is:
+ [ row | column ] || dense
+
+ Modified parsing in order to adapt it to the new syntax.
+
+ Also the current behavior relying on "stack" has been updated following
+ the spec. Now it won't be possible to mimic the old "none" (or "stack")
+ unless you specify manually the grid-placement properties.
+
+ No new tests needed, updated current tests to adapt them to the new
+ behavior.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue): Adapt to new syntax.
+ * css/CSSParser.cpp:
+ (WebCore::isValidGridAutoFlowId): Remove "stack" from valid ids.
+ (WebCore::CSSParser::parseGridAutoFlow): Adapt to new syntax.
+ * css/CSSValueKeywords.in: Remove "stack".
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty): Adapt to new syntax.
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::placeItemsOnGrid): Remove old "stack" code.
+ * rendering/style/GridResolvedPosition.cpp:
+ (WebCore::GridResolvedPosition::resolveGridPositionsFromStyle): If we
+ cannot resolve positions, we have to run the auto-placement algorithm.
+ * rendering/style/RenderStyle.h: Remove "stack".
+ * rendering/style/RenderStyleConstants.h: Ditto.
+
</ins><span class="cx"> 2015-01-01 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove GroupSettings
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -2190,8 +2190,6 @@
</span><span class="cx">
</span><span class="cx"> if (style->isGridAutoFlowAlgorithmDense())
</span><span class="cx"> list->append(cssValuePool().createIdentifierValue(CSSValueDense));
</span><del>- else if (style->isGridAutoFlowAlgorithmStack())
- list->append(cssValuePool().createIdentifierValue(CSSValueStack));
</del><span class="cx">
</span><span class="cx"> return list.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -5416,12 +5416,12 @@
</span><span class="cx">
</span><span class="cx"> static inline bool isValidGridAutoFlowId(CSSValueID id)
</span><span class="cx"> {
</span><del>- return (id == CSSValueRow || id == CSSValueColumn || id == CSSValueDense || id == CSSValueStack);
</del><ins>+ return (id == CSSValueRow || id == CSSValueColumn || id == CSSValueDense);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> CSSParser::parseGridAutoFlow(CSSParserValueList& inputList)
</span><span class="cx"> {
</span><del>- // [ row | column ] && dense? | stack && [ row | column ]?
</del><ins>+ // [ row | column ] || dense
</ins><span class="cx"> CSSParserValue* value = inputList.current();
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -5438,9 +5438,6 @@
</span><span class="cx"> value = inputList.next();
</span><span class="cx"> if (!value || !isValidGridAutoFlowId(value->id)) {
</span><span class="cx"> if (firstId == CSSValueDense)
</span><del>- return nullptr;
-
- if (firstId == CSSValueStack)
</del><span class="cx"> parsedValues->append(cssValuePool().createIdentifierValue(CSSValueRow));
</span><span class="cx">
</span><span class="cx"> parsedValues->append(cssValuePool().createIdentifierValue(firstId));
</span><span class="lines">@@ -5451,13 +5448,12 @@
</span><span class="cx"> case CSSValueRow:
</span><span class="cx"> case CSSValueColumn:
</span><span class="cx"> parsedValues->append(cssValuePool().createIdentifierValue(firstId));
</span><del>- if (value->id == CSSValueDense || value->id == CSSValueStack) {
</del><ins>+ if (value->id == CSSValueDense) {
</ins><span class="cx"> parsedValues->append(cssValuePool().createIdentifierValue(value->id));
</span><span class="cx"> inputList.next();
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueDense:
</span><del>- case CSSValueStack:
</del><span class="cx"> if (value->id == CSSValueRow || value->id == CSSValueColumn) {
</span><span class="cx"> parsedValues->append(cssValuePool().createIdentifierValue(value->id));
</span><span class="cx"> inputList.next();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -1076,7 +1076,6 @@
</span><span class="cx">
</span><span class="cx"> // -webkit-grid-auto-flow
</span><span class="cx"> dense
</span><del>-stack
</del><span class="cx">
</span><span class="cx"> #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT
</span><span class="cx"> // text-indent
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -2762,14 +2762,14 @@
</span><span class="cx"> GridAutoFlow autoFlow = RenderStyle::initialGridAutoFlow();
</span><span class="cx"> switch (first.getValueID()) {
</span><span class="cx"> case CSSValueRow:
</span><del>- if (second)
- autoFlow = second->getValueID() == CSSValueDense ? AutoFlowRowDense : AutoFlowStackRow;
</del><ins>+ if (second && second->getValueID() == CSSValueDense)
+ autoFlow = AutoFlowRowDense;
</ins><span class="cx"> else
</span><span class="cx"> autoFlow = AutoFlowRow;
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueColumn:
</span><del>- if (second)
- autoFlow = second->getValueID() == CSSValueDense ? AutoFlowColumnDense : AutoFlowStackColumn;
</del><ins>+ if (second && second->getValueID() == CSSValueDense)
+ autoFlow = AutoFlowColumnDense;
</ins><span class="cx"> else
</span><span class="cx"> autoFlow = AutoFlowColumn;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -743,14 +743,6 @@
</span><span class="cx"> ASSERT(gridRowCount() >= GridResolvedPosition::explicitGridRowCount(style()));
</span><span class="cx"> ASSERT(gridColumnCount() >= GridResolvedPosition::explicitGridColumnCount(style()));
</span><span class="cx">
</span><del>- // FIXME: Implement properly "stack" value in auto-placement algorithm.
- if (style().isGridAutoFlowAlgorithmStack()) {
- // If we did collect some grid items, they won't be placed thus never laid out.
- ASSERT(!autoMajorAxisAutoGridItems.size());
- ASSERT(!specifiedMajorAxisAutoGridItems.size());
- return;
- }
-
</del><span class="cx"> placeSpecifiedMajorAxisItemsOnGrid(specifiedMajorAxisAutoGridItems);
</span><span class="cx"> placeAutoMajorAxisItemsOnGrid(autoMajorAxisAutoGridItems);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridResolvedPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/rendering/style/GridResolvedPosition.cpp 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -135,14 +135,9 @@
</span><span class="cx">
</span><span class="cx"> adjustGridPositionsFromStyle(gridContainerStyle, initialPosition, finalPosition, initialPositionSide, finalPositionSide);
</span><span class="cx">
</span><del>- if (initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition()) {
- // FIXME: Implement properly "stack" value in auto-placement algorithm.
- if (gridContainerStyle.isGridAutoFlowAlgorithmStack())
- return std::make_unique<GridSpan>(0, 0);
-
- // We can't get our grid positions without running the auto placement algorithm.
</del><ins>+ // We can't get our grid positions without running the auto placement algorithm.
+ if (initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition())
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (initialPosition.shouldBeResolvedAgainstOppositePosition()) {
</span><span class="cx"> // Infer the position from the final position ('auto / 1' or 'span 2 / 3' case).
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -930,7 +930,6 @@
</span><span class="cx"> bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn); }
</span><span class="cx"> bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse); }
</span><span class="cx"> bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense); }
</span><del>- bool isGridAutoFlowAlgorithmStack() const { return (rareNonInheritedData->m_grid->m_gridAutoFlow & InternalAutoFlowAlgorithmStack); }
</del><span class="cx"> const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData->m_grid->m_gridAutoColumns; }
</span><span class="cx"> const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_grid->m_gridAutoRows; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (177857 => 177858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-01-02 05:26:52 UTC (rev 177857)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-01-02 10:01:11 UTC (rev 177858)
</span><span class="lines">@@ -604,25 +604,22 @@
</span><span class="cx"> enum RubyPosition { RubyPositionBefore, RubyPositionAfter, RubyPositionInterCharacter };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>-static const size_t GridAutoFlowBits = 5;
</del><ins>+static const size_t GridAutoFlowBits = 4;
</ins><span class="cx"> enum InternalGridAutoFlowAlgorithm {
</span><span class="cx"> InternalAutoFlowAlgorithmSparse = 0x1,
</span><span class="cx"> InternalAutoFlowAlgorithmDense = 0x2,
</span><del>- InternalAutoFlowAlgorithmStack = 0x4
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum InternalGridAutoFlowDirection {
</span><del>- InternalAutoFlowDirectionRow = 0x8,
- InternalAutoFlowDirectionColumn = 0x10
</del><ins>+ InternalAutoFlowDirectionRow = 0x4,
+ InternalAutoFlowDirectionColumn = 0x8
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum GridAutoFlow {
</span><span class="cx"> AutoFlowRow = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionRow,
</span><span class="cx"> AutoFlowColumn = InternalAutoFlowAlgorithmSparse | InternalAutoFlowDirectionColumn,
</span><span class="cx"> AutoFlowRowDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectionRow,
</span><del>- AutoFlowColumnDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectionColumn,
- AutoFlowStackRow = InternalAutoFlowAlgorithmStack | InternalAutoFlowDirectionRow,
- AutoFlowStackColumn = InternalAutoFlowAlgorithmStack | InternalAutoFlowDirectionColumn
</del><ins>+ AutoFlowColumnDense = InternalAutoFlowAlgorithmDense | InternalAutoFlowDirectionColumn
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>