<!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>[171183] trunk/LayoutTests</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/171183">171183</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2014-07-17 08:58:13 -0700 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Add element.style coverage for grid-auto-flow
https://bugs.webkit.org/show_bug.cgi?id=134966
Reviewed by Sergio Villar Senin.
As follow-up patch after <a href="http://trac.webkit.org/projects/webkit/changeset/170996">r170996</a> we're adding new test cases for
grid-auto-flow to check the correct behavior of element.style.
* fast/css-grid-layout/grid-auto-flow-get-set-expected.txt: Updated
expectations accordingly.
* fast/css-grid-layout/grid-auto-flow-get-set.html: Updated test to add
checks for element.style.
* fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
(checkGridAutoFlowSetCSSValue): Add new helper method to check
grid-auto-flow property.
(checkGridAutoFlowSetJSValue): Ditto.</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="#trunkLayoutTestsfastcssgridlayoutresourcesgriddefinitionsparsingutilsjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171182 => 171183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-17 10:55:57 UTC (rev 171182)
+++ trunk/LayoutTests/ChangeLog 2014-07-17 15:58:13 UTC (rev 171183)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-17 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Add element.style coverage for grid-auto-flow
+ https://bugs.webkit.org/show_bug.cgi?id=134966
+
+ Reviewed by Sergio Villar Senin.
+
+ As follow-up patch after r170996 we're adding new test cases for
+ grid-auto-flow to check the correct behavior of element.style.
+
+ * fast/css-grid-layout/grid-auto-flow-get-set-expected.txt: Updated
+ expectations accordingly.
+ * fast/css-grid-layout/grid-auto-flow-get-set.html: Updated test to add
+ checks for element.style.
+ * fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
+ (checkGridAutoFlowSetCSSValue): Add new helper method to check
+ grid-auto-flow property.
+ (checkGridAutoFlowSetJSValue): Ditto.
+
</ins><span class="cx"> 2014-07-16 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed GTK gardening.
</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 (171182 => 171183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt 2014-07-17 10:55:57 UTC (rev 171182)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt 2014-07-17 15:58:13 UTC (rev 171183)
</span><span class="lines">@@ -15,6 +15,10 @@
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowStackRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowColumnStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</span><ins>+PASS window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
+PASS window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
+
+Test getting -webkit-grid-auto-flow bad values set through CSS
</ins><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><span class="lines">@@ -24,34 +28,51 @@
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowDenseColumnStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowDenseRowStack, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFlowStackRowRow, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><del>-PASS window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
-PASS window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</del><span class="cx">
</span><span class="cx"> Test the initial value
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx">
</span><span class="cx"> Test getting and setting -webkit-grid-auto-flow through JS
</span><ins>+PASS element.style.webkitGridAutoFlow is 'column'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'column dense'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row dense'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'column dense'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column dense'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row dense'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row dense'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row stack'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'column stack'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row stack'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'column stack'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'column stack'
</span><ins>+PASS element.style.webkitGridAutoFlow is 'row stack'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row stack'
</span><span class="cx">
</span><span class="cx"> Test getting and setting bad values for -webkit-grid-auto-flow through JS
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><ins>+PASS element.style.webkitGridAutoFlow is ''
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx">
</span><span class="cx"> Test setting -webkit-grid-auto-flow to 'initial' through JS
</span><ins>+PASS element.style.webkitGridAutoFlow is 'initial'
</ins><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow') is 'row'
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</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 (171182 => 171183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html 2014-07-17 10:55:57 UTC (rev 171182)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html 2014-07-17 15:58:13 UTC (rev 171183)
</span><span class="lines">@@ -89,129 +89,68 @@
</span><span class="cx"> <div class="grid gridAutoFlowDenseColumnStack" id="gridAutoFlowDenseColumnStack"></div>
</span><span class="cx"> <div class="grid gridAutoFlowDenseRowStack" id="gridAutoFlowDenseRowStack"></div>
</span><span class="cx"> <div class="grid gridAutoFlowStackRowRow" id="gridAutoFlowStackRowRow"></div>
</span><ins>+<script src="resources/grid-definitions-parsing-utils.js"></script>
</ins><span class="cx"> <script>
</span><span class="cx"> description('Test that setting and getting -webkit-grid-auto-flow works as expected');
</span><span class="cx">
</span><span class="cx"> debug("Test getting -webkit-grid-auto-flow set through CSS");
</span><del>- var gridAutoFlowColumn = document.getElementById("gridAutoFlowColumn");
- shouldBe("window.getComputedStyle(gridAutoFlowColumn, '').getPropertyValue('-webkit-grid-auto-flow')", "'column'");
</del><ins>+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumn", "column");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowRow", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumnDense", "column dense");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowRowDense", "row dense");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowDenseColumn", "column dense");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowDenseRow", "row dense");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowStack", "row stack");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowStackColumn", "column stack");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowStackRow", "row stack");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumnStack", "column stack");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowRowStack", "row stack");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowInherit", "column");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowNoInherit", "row");
</ins><span class="cx">
</span><del>- var gridAutoFlowRow = document.getElementById("gridAutoFlowRow");
- shouldBe("window.getComputedStyle(gridAutoFlowRow, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
</del><ins>+ debug("");
+ debug("Test getting -webkit-grid-auto-flow bad values set through CSS");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowNone", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumns", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowRows", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowDense", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumnFoo", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowColumnColumn", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowDenseColumnStack", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowDenseRowStack", "row");
+ checkGridAutoFlowSetCSSValue("gridAutoFlowStackRowRow", "row");
</ins><span class="cx">
</span><del>- var gridAutoFlowColumnDense = document.getElementById("gridAutoFlowColumnDense");
- shouldBe("window.getComputedStyle(gridAutoFlowColumnDense, '').getPropertyValue('-webkit-grid-auto-flow')", "'column dense'");
-
- var gridAutoFlowRowDense = document.getElementById("gridAutoFlowRowDense");
- shouldBe("window.getComputedStyle(gridAutoFlowRowDense, '').getPropertyValue('-webkit-grid-auto-flow')", "'row dense'");
-
- var gridAutoFlowDenseColumn = document.getElementById("gridAutoFlowDenseColumn");
- shouldBe("window.getComputedStyle(gridAutoFlowDenseColumn, '').getPropertyValue('-webkit-grid-auto-flow')", "'column dense'");
-
- var gridAutoFlowDenseRow = document.getElementById("gridAutoFlowDenseRow");
- shouldBe("window.getComputedStyle(gridAutoFlowDenseRow, '').getPropertyValue('-webkit-grid-auto-flow')", "'row dense'");
-
- var gridAutoFlowStack = document.getElementById("gridAutoFlowStack");
- shouldBe("window.getComputedStyle(gridAutoFlowStack, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
-
- var gridAutoFlowStackColumn = document.getElementById("gridAutoFlowStackColumn");
- shouldBe("window.getComputedStyle(gridAutoFlowStackColumn, '').getPropertyValue('-webkit-grid-auto-flow')", "'column stack'");
-
- var gridAutoFlowStackRow = document.getElementById("gridAutoFlowStackRow");
- shouldBe("window.getComputedStyle(gridAutoFlowStackRow, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
-
- var gridAutoFlowColumnStack = document.getElementById("gridAutoFlowColumnStack");
- shouldBe("window.getComputedStyle(gridAutoFlowColumnStack, '').getPropertyValue('-webkit-grid-auto-flow')", "'column stack'");
-
- var gridAutoFlowRowStack = document.getElementById("gridAutoFlowRowStack");
- shouldBe("window.getComputedStyle(gridAutoFlowRowStack, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
-
- var gridAutoFlowNone= document.getElementById("gridAutoFlowNone");
- shouldBe("window.getComputedStyle(gridAutoFlowNone, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowColumns = document.getElementById("gridAutoFlowColumns");
- shouldBe("window.getComputedStyle(gridAutoFlowColumns, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowRows = document.getElementById("gridAutoFlowRows");
- shouldBe("window.getComputedStyle(gridAutoFlowRows, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowDense = document.getElementById("gridAutoFlowDense");
- shouldBe("window.getComputedStyle(gridAutoFlowDense, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowColumnFoo = document.getElementById("gridAutoFlowColumnFoo");
- shouldBe("window.getComputedStyle(gridAutoFlowColumnFoo, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowColumnColumn = document.getElementById("gridAutoFlowColumnColumn");
- shouldBe("window.getComputedStyle(gridAutoFlowColumnColumn, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowDenseColumnStack = document.getElementById("gridAutoFlowDenseColumnStack");
- shouldBe("window.getComputedStyle(gridAutoFlowDenseColumnStack, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowDenseRowStack = document.getElementById("gridAutoFlowDenseRowStack");
- shouldBe("window.getComputedStyle(gridAutoFlowDenseRowStack, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowStackRowRow = document.getElementById("gridAutoFlowStackRowRow");
- shouldBe("window.getComputedStyle(gridAutoFlowStackRowRow, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
- var gridAutoFlowInherit = document.getElementById("gridAutoFlowInherit");
- shouldBe("window.getComputedStyle(gridAutoFlowInherit, '').getPropertyValue('-webkit-grid-auto-flow')", "'column'");
-
- var gridAutoFlowNoInherit = document.getElementById("gridAutoFlowNoInherit");
- shouldBe("window.getComputedStyle(gridAutoFlowNoInherit, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
-
</del><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><del>- element = document.createElement("div");
- document.body.appendChild(element);
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
</del><ins>+ checkGridAutoFlowSetJSValue("", "", "row");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting -webkit-grid-auto-flow through JS");
</span><del>- element.style.webkitGridAutoFlow = "column";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'column'");
- element.style.webkitGridAutoFlow = "column dense";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'column dense'");
- element.style.webkitGridAutoFlow = "row dense";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row dense'");
- element.style.webkitGridAutoFlow = "dense column";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'column dense'");
- element.style.webkitGridAutoFlow = "dense row";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row dense'");
- element.style.webkitGridAutoFlow = "row";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "stack";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
- element.style.webkitGridAutoFlow = "stack column";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'column stack'");
- element.style.webkitGridAutoFlow = "stack row";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
- element.style.webkitGridAutoFlow = "column stack";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'column stack'");
- element.style.webkitGridAutoFlow = "row stack";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row stack'");
</del><ins>+ checkGridAutoFlowSetJSValue("column", "column", "column");
+ checkGridAutoFlowSetJSValue("column dense", "column dense", "column dense");
+ checkGridAutoFlowSetJSValue("row dense", "row dense", "row dense");
+ checkGridAutoFlowSetJSValue("dense column", "column dense", "column dense");
+ checkGridAutoFlowSetJSValue("dense row", "row dense", "row dense");
+ checkGridAutoFlowSetJSValue("row", "row", "row");
+ 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");
</ins><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><del>- element = document.createElement("div");
- document.body.appendChild(element);
- element.style.webkitGridAutoFlow = "noone";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "dense";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "column column";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "dense column stack";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "dense row stack";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
- element.style.webkitGridAutoFlow = "stack row row";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
</del><ins>+ checkGridAutoFlowSetJSValue("noone", "", "row");
+ checkGridAutoFlowSetJSValue("dense", "", "row");
+ checkGridAutoFlowSetJSValue("column column", "", "row");
+ checkGridAutoFlowSetJSValue("dense column stack", "", "row");
+ checkGridAutoFlowSetJSValue("dense row stack", "", "row");
+ checkGridAutoFlowSetJSValue("stack 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 class="cx"> // Reusing the value so that we can check that it is set back to its initial value.
</span><del>- element.style.webkitGridAutoFlow = "initial";
- shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'row'");
</del><ins>+ checkGridAutoFlowSetJSValue("initial", "initial", "row");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgriddefinitionsparsingutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js (171182 => 171183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2014-07-17 10:55:57 UTC (rev 171182)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2014-07-17 15:58:13 UTC (rev 171183)
</span><span class="lines">@@ -45,3 +45,17 @@
</span><span class="cx"> testGridTemplatesValues(element, "none", "none");
</span><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><ins>+
+function checkGridAutoFlowSetCSSValue(elementId, expectedValue) {
+ shouldBe("window.getComputedStyle(" + elementId + ", '').getPropertyValue('-webkit-grid-auto-flow')", "'" + expectedValue + "'");
+}
+
+function checkGridAutoFlowSetJSValue(newValue, expectedStyleValue, expectedComputedStyleValue) {
+ element = document.createElement("div");
+ document.body.appendChild(element);
+ if (newValue)
+ element.style.webkitGridAutoFlow = newValue;
+ shouldBe("element.style.webkitGridAutoFlow", "'" + expectedStyleValue + "'");
+ shouldBe("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-auto-flow')", "'" + expectedComputedStyleValue + "'");
+ document.body.removeChild(element);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>