<!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>[163625] 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/163625">163625</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-07 09:45:49 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax
https://bugs.webkit.org/show_bug.cgi?id=127989
Patch by Javier Fernandez <jfernandez@igalia.com> on 2014-02-07
Reviewed by Andreas Kling.
In the latest WD, grid-definition-{columns|rows} were renamed to grid-template-{columns|rows}.
Source/WebCore:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
LayoutTests:
* fast/css-grid-layout/auto-content-resolution-columns.html:
* fast/css-grid-layout/auto-content-resolution-rows.html:
* fast/css-grid-layout/breadth-size-resolution-grid.html:
* fast/css-grid-layout/calc-resolution-grid-item.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-resolution-columns.html:
* fast/css-grid-layout/flex-content-resolution-rows.html:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-flow-update.html:
* fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-dynamic-updates-relayout.html:
* fast/css-grid-layout/grid-element-border-grid-item.html:
* fast/css-grid-layout/grid-element-border-padding-grid-item.html:
* fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
* fast/css-grid-layout/grid-element-change-columns-repaint.html:
* fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
* fast/css-grid-layout/grid-element-change-rows-repaint.html:
* fast/css-grid-layout/grid-element-empty-row-column.html:
* fast/css-grid-layout/grid-element-min-max-width.html:
* fast/css-grid-layout/grid-element-padding-grid-item.html:
* fast/css-grid-layout/grid-element-padding-margin.html:
* fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
* fast/css-grid-layout/grid-item-change-column-repaint.html:
* fast/css-grid-layout/grid-item-change-row-repaint.html:
* fast/css-grid-layout/grid-item-margin-resolution.html:
* fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
* fast/css-grid-layout/grid-item-order-paint-order.html:
* fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-item-spanning-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
* fast/css-grid-layout/grid-preferred-logical-widths.html:
* fast/css-grid-layout/implicit-columns-auto-resolution.html:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/implicit-rows-auto-resolution.html:
* fast/css-grid-layout/minmax-fixed-logical-height-only.html:
* fast/css-grid-layout/minmax-fixed-logical-width-only.html:
* fast/css-grid-layout/minmax-max-content-resolution-columns.html:
* fast/css-grid-layout/minmax-max-content-resolution-rows.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/minmax-spanning-resolution-rows.html:
* fast/css-grid-layout/named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/non-grid-element-repeat-get-set.html:
* fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/non-named-grid-line-get-set.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
* fast/css-grid-layout/percent-resolution-grid-item.html:
* fast/css-grid-layout/place-cell-by-index.html:
* fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
(testGridTemplatesValues):
(testGridTemplatesSetJSValues):
(testNonGridTemplatesSetJSValues):
(checkGridTemplatesSetJSValues):
(testGridTemplatesSetBadJSValues):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* ietestcenter/css3/grid/display-grid-001-expected.htm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutautocontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutautocontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutbreadthsizeresolutiongridhtml">trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutcalcresolutiongriditemhtml">trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexcontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexcontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriddynamicupdatesrelayouthtml">trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementbordergriditemhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementborderpaddinggriditemhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementchangecolumnsrepaintexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementchangecolumnsrepainthtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementchangerowsrepaintexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementchangerowsrepainthtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementemptyrowcolumnhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementminmaxwidthhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementpaddinggriditemhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementpaddingmarginhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemadditionautoplacementupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemadditiontrackbreadthupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditembadresolutiondoublespanhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemchangecolumnrepainthtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemchangerowrepainthtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmarginresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmultipleminmaxcontentresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.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="#trunkLayoutTestsfastcssgridlayoutgriditemnamedgridlineresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnegativeintegerexplicitgridresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnegativepositionresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemorderautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemorderpaintorderhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemremovalautoplacementupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemremovaltrackbreadthupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemspanningresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemwithpercentheightinautoheightgridresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemwithpercentminmaxheightdynamichtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpreferredlogicalwidthshtml">trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutimplicitcolumnsautoresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutimplicitpositiondynamicchangehtml">trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutimplicitrowsautoresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxfixedlogicalheightonlyhtml">trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxfixedlogicalwidthonlyhtml">trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackinpercentgridhtml">trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackupdatehtml">trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackhtml">trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentpaddingmarginresolutiongriditemupdatehtml">trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentpaddingmarginresolutiongriditemhtml">trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemhtml">trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutplacecellbyindexhtml">trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgriddefinitionsparsingutilsjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkLayoutTestsietestcentercss3griddisplaygrid001expectedhtm">trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.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="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/ChangeLog 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,3 +1,110 @@
</span><ins>+2014-02-07 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax
+ https://bugs.webkit.org/show_bug.cgi?id=127989
+
+ Reviewed by Andreas Kling.
+
+ In the latest WD, grid-definition-{columns|rows} were renamed to grid-template-{columns|rows}.
+
+ * fast/css-grid-layout/auto-content-resolution-columns.html:
+ * fast/css-grid-layout/auto-content-resolution-rows.html:
+ * fast/css-grid-layout/breadth-size-resolution-grid.html:
+ * fast/css-grid-layout/calc-resolution-grid-item.html:
+ * fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
+ * fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
+ * fast/css-grid-layout/flex-content-resolution-columns.html:
+ * fast/css-grid-layout/flex-content-resolution-rows.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-update.html:
+ * fast/css-grid-layout/grid-auto-flow-resolution.html:
+ * fast/css-grid-layout/grid-auto-flow-update.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/grid-dynamic-updates-relayout.html:
+ * fast/css-grid-layout/grid-element-border-grid-item.html:
+ * fast/css-grid-layout/grid-element-border-padding-grid-item.html:
+ * fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt:
+ * fast/css-grid-layout/grid-element-change-columns-repaint.html:
+ * fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt:
+ * fast/css-grid-layout/grid-element-change-rows-repaint.html:
+ * fast/css-grid-layout/grid-element-empty-row-column.html:
+ * fast/css-grid-layout/grid-element-min-max-width.html:
+ * fast/css-grid-layout/grid-element-padding-grid-item.html:
+ * fast/css-grid-layout/grid-element-padding-margin.html:
+ * fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
+ * fast/css-grid-layout/grid-element-repeat-get-set.html:
+ * fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
+ * fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
+ * fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
+ * fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
+ * fast/css-grid-layout/grid-item-change-column-repaint.html:
+ * fast/css-grid-layout/grid-item-change-row-repaint.html:
+ * fast/css-grid-layout/grid-item-margin-resolution.html:
+ * fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
+ * fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
+ * fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
+ * fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
+ * fast/css-grid-layout/grid-item-negative-position-resolution.html:
+ * fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
+ * fast/css-grid-layout/grid-item-order-paint-order.html:
+ * fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
+ * fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
+ * fast/css-grid-layout/grid-item-spanning-resolution.html:
+ * fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
+ * fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
+ * fast/css-grid-layout/grid-preferred-logical-widths.html:
+ * fast/css-grid-layout/implicit-columns-auto-resolution.html:
+ * fast/css-grid-layout/implicit-position-dynamic-change.html:
+ * fast/css-grid-layout/implicit-rows-auto-resolution.html:
+ * fast/css-grid-layout/minmax-fixed-logical-height-only.html:
+ * fast/css-grid-layout/minmax-fixed-logical-width-only.html:
+ * fast/css-grid-layout/minmax-max-content-resolution-columns.html:
+ * fast/css-grid-layout/minmax-max-content-resolution-rows.html:
+ * fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
+ * fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
+ * fast/css-grid-layout/minmax-spanning-resolution-columns.html:
+ * fast/css-grid-layout/minmax-spanning-resolution-rows.html:
+ * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+ * fast/css-grid-layout/named-grid-line-get-set.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
+ * fast/css-grid-layout/non-grid-element-repeat-get-set.html:
+ * fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
+ * fast/css-grid-layout/non-named-grid-line-get-set.html:
+ * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
+ * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
+ * fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
+ * fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
+ * fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
+ * fast/css-grid-layout/percent-resolution-grid-item.html:
+ * fast/css-grid-layout/place-cell-by-index.html:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
+ (testGridTemplatesValues):
+ (testGridTemplatesSetJSValues):
+ (testNonGridTemplatesSetJSValues):
+ (checkGridTemplatesSetJSValues):
+ (testGridTemplatesSetBadJSValues):
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
+ (testInherit):
+ (testInitial):
+ * ietestcenter/css3/grid/display-grid-001-expected.htm:
+
</ins><span class="cx"> 2014-02-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> animations/suspend-resume-animation.html is flakey
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutautocontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><del>- -webkit-grid-definition-columns: auto;
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: auto;
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutautocontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: auto;
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutbreadthsizeresolutiongridhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 100px 10vw;
- -webkit-grid-definition-rows: 10vh 100px;
</del><ins>+ -webkit-grid-template-columns: 100px 10vw;
+ -webkit-grid-template-rows: 10vh 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutcalcresolutiongriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 100px 300px;
- -webkit-grid-definition-rows: 50px 150px;
</del><ins>+ -webkit-grid-template-columns: 100px 300px;
+ -webkit-grid-template-rows: 50px 150px;
</ins><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,28 +7,28 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMinContent {
</span><del>- -webkit-grid-definition-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithIntrinsicSizeBiggerThanFlex {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridShrinkBelowItemsIntrinsicSize {
</span><del>- -webkit-grid-definition-columns: minmax(0px, 1fr) minmax(0px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(0px, 1fr) minmax(0px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithNonFlexingItems {
</span><del>- -webkit-grid-definition-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowThirdColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,28 +7,28 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMinContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithIntrinsicSizeBiggerThanFlex {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridShrinkBelowItemsIntrinsicSize {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(0px, 1fr) minmax(0px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(0px, 1fr) minmax(0px, 2fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithNonFlexingItems {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .thirdRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexcontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,24 +7,24 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinFlexContent {
</span><del>- -webkit-grid-definition-columns: minmax(1fr, 50px);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(1fr, 50px);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: minmax(30px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(30px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx"> .gridTwoMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: minmax(10px, 1fr) minmax(10px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx"> .gridTwoDoubleMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx"> .gridIgnoreSecondGridItem {
</span><del>- -webkit-grid-definition-columns: minmax(300px, 3fr) minmax(150px, 1fr);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexcontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,20 +7,20 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinFlexContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(1fr, 50px);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(1fr, 50px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(30px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(30px, 2fr);
</ins><span class="cx"> }
</span><span class="cx"> .gridTwoMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(10px, 1fr) minmax(10px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
</ins><span class="cx"> }
</span><span class="cx"> .gridTwoDoubleMaxFlexContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</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-definition-rows: 5px;
- -webkit-grid-definition-columns: 10px;
</del><ins>+ -webkit-grid-template-rows: 5px;
+ -webkit-grid-template-columns: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoFixedFixed {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</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-definition-rows: 20px;
- -webkit-grid-definition-columns: 10px;
</del><ins>+ -webkit-grid-template-rows: 20px;
+ -webkit-grid-template-columns: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoFixedFixed {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</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-definition-rows: 20px;
- -webkit-grid-definition-columns: 10px;
</del><ins>+ -webkit-grid-template-rows: 20px;
+ -webkit-grid-template-columns: 10px;
</ins><span class="cx"> -webkit-grid-auto-rows: 30px;
</span><span class="cx"> -webkit-grid-auto-columns: 50px;
</span><span class="cx"> font: 10px/1 Ahem;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .smallGrid {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .bigGrid {
</span><del>- -webkit-grid-definition-columns: 50px 100px 150px 200px;
- -webkit-grid-definition-rows: 50px 100px 150px 200px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px 150px 200px;
+ -webkit-grid-template-rows: 50px 100px 150px 200px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .overflowingRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,149 +1,149 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "424px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "162px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-columns') is "7px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-definition-columns') is "80px"
-PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-definition-rows') is "300px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-columns') is "17px"
-PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-columns') is "17px"
-PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-rows') is "11px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-definition-columns') is "800px"
-PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-definition-rows') is "600px"
</del><ins>+Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
+PASS window.getComputedStyle(gridWithMinMaxElement, '').getPropertyValue('-webkit-grid-template-rows') is "300px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMinContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMinContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "17px"
+PASS window.getComputedStyle(gridWithMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
+PASS window.getComputedStyle(gridWithFractionElement, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
</ins><span class="cx">
</span><del>-Test getting wrong values for -webkit-grid-definition-columns and -webkit-grid-definition-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><del>-Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px"
-PASS element.style.webkitGridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px"
-PASS element.style.webkitGridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "440px"
-PASS element.style.webkitGridDefinitionColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "240px"
-PASS element.style.webkitGridDefinitionRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS element.style.webkitGridDefinitionColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS element.style.webkitGridDefinitionRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "80px"
-PASS element.style.webkitGridDefinitionColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "150px"
-PASS element.style.webkitGridDefinitionRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS element.style.webkitGridDefinitionColumns is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS element.style.webkitGridDefinitionRows is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS element.style.webkitGridDefinitionColumns is "-webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS element.style.webkitGridDefinitionRows is "-webkit-max-content"
</del><ins>+Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
+PASS element.style.webkitGridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
+PASS element.style.webkitGridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px"
+PASS element.style.webkitGridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px"
+PASS element.style.webkitGridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS element.style.webkitGridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS element.style.webkitGridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
+PASS element.style.webkitGridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
+PASS element.style.webkitGridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS element.style.webkitGridTemplateColumns is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS element.style.webkitGridTemplateColumns is "-webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content"
</ins><span class="cx">
</span><del>-Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "440px"
-PASS element.style.webkitGridDefinitionColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "240px"
-PASS element.style.webkitGridDefinitionRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "220px"
-PASS element.style.webkitGridDefinitionColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "80px"
-PASS element.style.webkitGridDefinitionRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "48px"
-PASS element.style.webkitGridDefinitionColumns is "minmax(-webkit-min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "80px"
-PASS element.style.webkitGridDefinitionRows is "minmax(10vw, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "220px"
-PASS element.style.webkitGridDefinitionColumns is "minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "50px"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px"
-PASS element.style.webkitGridDefinitionColumns is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "800px"
-PASS element.style.webkitGridDefinitionColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "600px"
-PASS element.style.webkitGridDefinitionRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "800px"
-PASS element.style.webkitGridDefinitionColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "600px"
-PASS element.style.webkitGridDefinitionRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "800px"
-PASS element.style.webkitGridDefinitionColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "600px"
-PASS element.style.webkitGridDefinitionRows is "4fr"
</del><ins>+Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows to minmax() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px"
+PASS element.style.webkitGridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "220px"
+PASS element.style.webkitGridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "48px"
+PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "80px"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "220px"
+PASS element.style.webkitGridTemplateColumns is "minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px"
+PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
+PASS element.style.webkitGridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
+PASS element.style.webkitGridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
+PASS element.style.webkitGridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
+PASS element.style.webkitGridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "800px"
+PASS element.style.webkitGridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px"
+PASS element.style.webkitGridTemplateRows is "4fr"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test setting grid-template-columns and grid-template-rows to bad values through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px"
-PASS element.style.webkitGridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px"
-PASS element.style.webkitGridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS element.style.webkitGridDefinitionColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS element.style.webkitGridDefinitionRows is "none"
</del><ins>+Test setting grid-template-columns and grid-template-rows back to 'none' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
+PASS element.style.webkitGridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
+PASS element.style.webkitGridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS element.style.webkitGridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS element.style.webkitGridTemplateRows is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '50px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'first 20px'
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '50px last'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'first 20px'
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '450px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'first 150px'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '450px last'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'first 150px'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,101 +1,101 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "424px 792px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "162px 312px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "0px 17px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "0px 3px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-columns') is "15px 0px 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-rows') is "120px 18px 0px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-columns') is "400px 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-rows') is "210px 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is "0px 0px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-columns') is "7px 17px"
-PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-rows') is "11px 3px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is "240px 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is "120px 210px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-definition-columns') is "320px 480px"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-definition-rows') is "225px 375px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is "45px 755px"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is "586px 14px"
</del><ins>+Test getting |grid-template-columns| and |grid-template-rows| set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px 792px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px 312px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "0px 17px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px 3px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-columns') is "15px 0px 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-rows') is "120px 18px 0px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-columns') is "400px 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-rows') is "210px 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 17px"
+PASS window.getComputedStyle(gridWithMinMaxContentWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "11px 3px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "240px 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "120px 210px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-columns') is "320px 480px"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-rows') is "225px 375px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "45px 755px"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "586px 14px"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx">
</span><del>-Test getting and setting grid-definition-rows and grid-definition-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px 22px"
-PASS element.style.webkitGridDefinitionColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px 70px"
-PASS element.style.webkitGridDefinitionRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "440px 640px"
-PASS element.style.webkitGridDefinitionColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "240px 378px"
-PASS element.style.webkitGridDefinitionRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px 0px"
-PASS element.style.webkitGridDefinitionColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px 0px"
-PASS element.style.webkitGridDefinitionRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "0px 160px 22px"
-PASS element.style.webkitGridDefinitionColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "336px 100px 0px"
-PASS element.style.webkitGridDefinitionRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "160px 20px"
-PASS element.style.webkitGridDefinitionColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "90px 0px"
-PASS element.style.webkitGridDefinitionRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "160px 640px"
-PASS element.style.webkitGridDefinitionColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "600px 0px"
-PASS element.style.webkitGridDefinitionRows is "14fr auto"
</del><ins>+Test getting and setting grid-template-rows and grid-template-columns through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px 22px"
+PASS element.style.webkitGridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px 70px"
+PASS element.style.webkitGridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "440px 640px"
+PASS element.style.webkitGridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px 378px"
+PASS element.style.webkitGridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 0px"
+PASS element.style.webkitGridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
+PASS element.style.webkitGridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "0px 160px 22px"
+PASS element.style.webkitGridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "336px 100px 0px"
+PASS element.style.webkitGridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 20px"
+PASS element.style.webkitGridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "90px 0px"
+PASS element.style.webkitGridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 640px"
+PASS element.style.webkitGridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "600px 0px"
+PASS element.style.webkitGridTemplateRows is "14fr auto"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values set from CSS
</span><del>-PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><span class="cx"> Test setting and getting wrong values from JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "50px 750px last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "20px middle 45px"
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 750px last"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "20px middle 45px"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "1200px middle 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "200px line 400px line"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "1200px middle 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "200px line 400px line"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -25,64 +25,64 @@
</span><span class="cx"> height: 3px;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: 7px 11px;
- -webkit-grid-definition-rows: 17px 2px;
</del><ins>+ -webkit-grid-template-columns: 7px 11px;
+ -webkit-grid-template-rows: 17px 2px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53% 99%;
- -webkit-grid-definition-rows: 27% 52%;
</del><ins>+ -webkit-grid-template-columns: 53% 99%;
+ -webkit-grid-template-rows: 27% 52%;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: auto auto;
- -webkit-grid-definition-rows: auto auto;
</del><ins>+ -webkit-grid-template-columns: auto auto;
+ -webkit-grid-template-rows: auto auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithEM {
</span><del>- -webkit-grid-definition-columns: 10em 12em;
- -webkit-grid-definition-rows: 15em 17em;
</del><ins>+ -webkit-grid-template-columns: 10em 12em;
+ -webkit-grid-template-rows: 15em 17em;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithNoneAndAuto {
</span><del>- -webkit-grid-definition-columns: none auto;
- -webkit-grid-definition-rows: none auto;
</del><ins>+ -webkit-grid-template-columns: none auto;
+ -webkit-grid-template-rows: none auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridNoneWithAndFixed {
</span><del>- -webkit-grid-definition-columns: none 15px;
- -webkit-grid-definition-rows: none 22px;
</del><ins>+ -webkit-grid-template-columns: none 15px;
+ -webkit-grid-template-rows: none 22px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithThreeItems {
</span><del>- -webkit-grid-definition-columns: 15px auto 10em;
- -webkit-grid-definition-rows: 12em 18px auto;
</del><ins>+ -webkit-grid-template-columns: 15px auto 10em;
+ -webkit-grid-template-rows: 12em 18px auto;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithPercentAndViewportPercent {
</span><del>- -webkit-grid-definition-columns: 50% 15vw;
- -webkit-grid-definition-rows: 35% 28vh;
</del><ins>+ -webkit-grid-template-columns: 50% 15vw;
+ -webkit-grid-template-rows: 35% 28vh;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitContentAndFitAvailable {
</span><del>- -webkit-grid-definition-columns: -webkit-content-available;
- -webkit-grid-definition-rows: -webkit-fitcontent -webkit-fit-available;
</del><ins>+ -webkit-grid-template-columns: -webkit-content-available;
+ -webkit-grid-template-rows: -webkit-fitcontent -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxContent {
</span><del>- -webkit-grid-definition-columns: -webkit-min-content -webkit-max-content;
- -webkit-grid-definition-rows: -webkit-max-content -webkit-min-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-min-content -webkit-max-content;
+ -webkit-grid-template-rows: -webkit-max-content -webkit-min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndFixed {
</span><del>- -webkit-grid-definition-columns: minmax(45px, 30%) 15px;
- -webkit-grid-definition-rows: 12em minmax(35%, 10px);
</del><ins>+ -webkit-grid-template-columns: minmax(45px, 30%) 15px;
+ -webkit-grid-template-rows: 12em minmax(35%, 10px);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndMinMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 30%) 15px;
- -webkit-grid-definition-rows: 12em minmax(35%, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
+ -webkit-grid-template-rows: 12em minmax(35%, -webkit-max-content);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionFraction {
</span><del>- -webkit-grid-definition-columns: 2fr 3fr;
- -webkit-grid-definition-rows: 3fr 5fr;
</del><ins>+ -webkit-grid-template-columns: 2fr 3fr;
+ -webkit-grid-template-rows: 3fr 5fr;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFractionMinMax {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 45px) 2fr;
- -webkit-grid-definition-rows: 3fr minmax(14px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
+ -webkit-grid-template-rows: 3fr minmax(14px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -25,53 +25,53 @@
</span><span class="cx"> height: 3px;
</span><span class="cx"> }
</span><span class="cx"> .gridWithNone {
</span><del>- -webkit-grid-definition-columns: none;
- -webkit-grid-definition-rows: none;
</del><ins>+ -webkit-grid-template-columns: none;
+ -webkit-grid-template-rows: none;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: 10px;
- -webkit-grid-definition-rows: 15px;
</del><ins>+ -webkit-grid-template-columns: 10px;
+ -webkit-grid-template-rows: 15px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53%;
- -webkit-grid-definition-rows: 27%;
</del><ins>+ -webkit-grid-template-columns: 53%;
+ -webkit-grid-template-rows: 27%;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: auto;
- -webkit-grid-definition-rows: auto;
</del><ins>+ -webkit-grid-template-columns: auto;
+ -webkit-grid-template-rows: auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithEM {
</span><del>- -webkit-grid-definition-columns: 10em;
- -webkit-grid-definition-rows: 15em;
</del><ins>+ -webkit-grid-template-columns: 10em;
+ -webkit-grid-template-rows: 15em;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithViewPortPercentage {
</span><del>- -webkit-grid-definition-columns: 8vw;
- -webkit-grid-definition-rows: 10vh;
</del><ins>+ -webkit-grid-template-columns: 8vw;
+ -webkit-grid-template-rows: 10vh;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitContent {
</span><del>- -webkit-grid-definition-columns: -webkit-fit-content;
- -webkit-grid-definition-rows: -webkit-fit-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-fit-content;
+ -webkit-grid-template-rows: -webkit-fit-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitAvailable {
</span><del>- -webkit-grid-definition-columns: -webkit-fit-available;
- -webkit-grid-definition-rows: -webkit-fit-available;
</del><ins>+ -webkit-grid-template-columns: -webkit-fit-available;
+ -webkit-grid-template-rows: -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMax {
</span><del>- -webkit-grid-definition-columns: minmax(10%, 15px);
- -webkit-grid-definition-rows: minmax(20px, 50%);
</del><ins>+ -webkit-grid-template-columns: minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinContent {
</span><del>- -webkit-grid-definition-columns: -webkit-min-content;
- -webkit-grid-definition-rows: -webkit-min-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-min-content;
+ -webkit-grid-template-rows: -webkit-min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMaxContent {
</span><del>- -webkit-grid-definition-columns: -webkit-max-content;
- -webkit-grid-definition-rows: -webkit-max-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-max-content;
+ -webkit-grid-template-rows: -webkit-max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFraction {
</span><del>- -webkit-grid-definition-columns: 1fr;
- -webkit-grid-definition-rows: 2fr;
</del><ins>+ -webkit-grid-template-columns: 1fr;
+ -webkit-grid-template-rows: 2fr;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriddynamicupdatesrelayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> function testLayout(gridElementID, gridTracks, size)
</span><span class="cx"> {
</span><span class="cx"> var gridElement = document.getElementById(gridElementID);
</span><del>- gridElement.style.webkitGridDefinitionColumns = gridTracks.columns;
- gridElement.style.webkitGridDefinitionRows = gridTracks.rows;
</del><ins>+ gridElement.style.webkitGridTemplateColumns = gridTracks.columns;
+ gridElement.style.webkitGridTemplateRows = gridTracks.rows;
</ins><span class="cx"> var gridItem = gridElement.firstChild.nextSibling;
</span><span class="cx"> gridItem.setAttribute("data-expected-width", size.width);
</span><span class="cx"> gridItem.setAttribute("data-expected-height", size.height);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementbordergriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -12,8 +12,8 @@
</span><span class="cx"> border-right: 30px dotted blue;
</span><span class="cx"> border-bottom: 40px dotted blue;
</span><span class="cx"> border-left: 50px dotted blue;
</span><del>- -webkit-grid-definition-rows: 100px 100px;
- -webkit-grid-definition-columns: 100px 100px;
</del><ins>+ -webkit-grid-template-rows: 100px 100px;
+ -webkit-grid-template-columns: 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementborderpaddinggriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> border-right: 20px dotted blue;
</span><span class="cx"> border-bottom: 30px dotted blue;
</span><span class="cx"> border-left: 40px dotted blue;
</span><del>- -webkit-grid-definition-rows: 100px 100px;
- -webkit-grid-definition-columns: 100px 100px;
</del><ins>+ -webkit-grid-template-rows: 100px 100px;
+ -webkit-grid-template-columns: 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementchangecolumnsrepaintexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-definition-columns change should be seen.
</del><ins>+This test checks that changing the grid-template-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-template-columns change should be seen.
</ins><span class="cx"> (repaint rects
</span><span class="cx"> (rect 8 48 100 50)
</span><span class="cx"> (rect 8 48 50 50)
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementchangecolumnsrepainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> function repaintTest()
</span><span class="cx"> {
</span><span class="cx"> var gridElement = document.getElementsByClassName("grid")[0];
</span><del>- gridElement.style.webkitGridDefinitionColumns = "minmax(50px, 180px) 100px 100px";
</del><ins>+ gridElement.style.webkitGridTemplateColumns = "minmax(50px, 180px) 100px 100px";
</ins><span class="cx"> }
</span><span class="cx"> window.addEventListener("load", runRepaintTest, false);
</span><span class="cx"> </script>
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">
</span><span class="cx"> .grid {
</span><span class="cx"> width: -webkit-fit-content;
</span><del>- -webkit-grid-definition-rows: 50px;
- -webkit-grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
</del><ins>+ -webkit-grid-template-rows: 50px;
+ -webkit-grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
</ins><span class="cx"> }
</span><span class="cx"> .sizedToGridArea {
</span><span class="cx"> background-color: purple;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <body>
</span><del>-<div> This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-definition-columns change should be seen.</div>
</del><ins>+<div> This test checks that changing the grid-template-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-template-columns change should be seen.</div>
</ins><span class="cx"> <div class="constrainedContainer">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sizedToGridArea"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementchangerowsrepaintexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.
</del><ins>+This test checks that changing the grid-template-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-template-rows change should be seen.
</ins><span class="cx"> (repaint rects
</span><span class="cx"> (rect 8 48 100 50)
</span><span class="cx"> (rect 8 48 100 100)
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementchangerowsrepainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> function repaintTest()
</span><span class="cx"> {
</span><span class="cx"> var gridElement = document.getElementsByClassName("grid")[0];
</span><del>- gridElement.style.webkitGridDefinitionRows = "100px 50px";
</del><ins>+ gridElement.style.webkitGridTemplateRows = "100px 50px";
</ins><span class="cx"> }
</span><span class="cx"> window.addEventListener("load", runRepaintTest, false);
</span><span class="cx"> </script>
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">
</span><span class="cx"> .grid {
</span><span class="cx"> width: -webkit-fit-content;
</span><del>- -webkit-grid-definition-rows: 50px 100px;
- -webkit-grid-definition-columns: 100px;
</del><ins>+ -webkit-grid-template-rows: 50px 100px;
+ -webkit-grid-template-columns: 100px;
</ins><span class="cx"> }
</span><span class="cx"> .sizedToGridArea {
</span><span class="cx"> background-color: purple;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <body>
</span><del>-<div>This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.</div>
</del><ins>+<div>This test checks that changing the grid-template-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-template-rows change should be seen.</div>
</ins><span class="cx"> <div class="constrainedContainer">
</span><span class="cx"> <div class="grid">
</span><span class="cx"> <div class="sizedToGridArea"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementemptyrowcolumnhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -6,12 +6,12 @@
</span><span class="cx"> <link href=resources/grid.css rel=stylesheet>
</span><span class="cx"> <style>
</span><span class="cx"> .gridNoRow {
</span><del>- -webkit-grid-definition-columns: 50px;
</del><ins>+ -webkit-grid-template-columns: 50px;
</ins><span class="cx"> /* Make the grid shrink-to-fit. */
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span><span class="cx"> .gridNoColumn {
</span><del>- -webkit-grid-definition-rows: 50px 80px;
</del><ins>+ -webkit-grid-template-rows: 50px 80px;
</ins><span class="cx"> /* Make the grid shrink-to-fit. */
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementminmaxwidthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -9,13 +9,13 @@
</span><span class="cx"> <style>
</span><span class="cx"> .minWidthGrid {
</span><span class="cx"> min-width: 100px;
</span><del>- -webkit-grid-definition-columns: 50px;
- -webkit-grid-definition-rows: 40px;
</del><ins>+ -webkit-grid-template-columns: 50px;
+ -webkit-grid-template-rows: 40px;
</ins><span class="cx"> }
</span><span class="cx"> .maxWidthGrid {
</span><span class="cx"> max-width: 100px;
</span><del>- -webkit-grid-definition-columns: 150px 50px;
- -webkit-grid-definition-rows: 40px;
</del><ins>+ -webkit-grid-template-columns: 150px 50px;
+ -webkit-grid-template-rows: 40px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .minWidthAutoGrid {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementpaddinggriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> padding: 20px 30px 40px 50px;
</span><del>- -webkit-grid-definition-rows: 100px 100px;
- -webkit-grid-definition-columns: 100px 100px;
</del><ins>+ -webkit-grid-template-rows: 100px 100px;
+ -webkit-grid-template-columns: 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementpaddingmarginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 100px;
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: 100px;
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> /* Force the grid element to be shrink-to-fit. */
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,38 +1,38 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-definition-columns') is "120px"
-PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-definition-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "0px 0px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-definition-columns') is "400px 400px"
-PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-definition-rows') is "44px 77px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "33px 120px 0px 120px"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px 77px 10px 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "33px middle 250px end 0px middle 250px end"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px start 77px end 10px start 0px end"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "before 0px before 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "before 10px before 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "250px end"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px end"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "start 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "start 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "start 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "44px 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "250px 250px 120px last"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px 10px end 0px"
</del><ins>+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-template-columns') is "120px"
+PASS window.getComputedStyle(singleSingleTrackRepeatWithSize, '').getPropertyValue('-webkit-grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "0px 0px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-template-columns') is "400px 400px"
+PASS window.getComputedStyle(twoSingleTrackRepeatWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is "44px 77px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "33px 120px 0px 120px"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 77px 10px 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "33px middle 250px end 0px middle 250px end"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px start 77px end 10px start 0px end"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "before 0px before 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "before 10px before 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px end"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px end"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "start 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "start 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "start 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "44px 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px 250px 120px last"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 10px end 0px"
</ins><span class="cx">
</span><span class="cx"> Test invalid repeat syntax.
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -28,48 +28,48 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .singleSingleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(1, 18px);
- -webkit-grid-definition-columns: repeat(1, 15%);
</del><ins>+ -webkit-grid-template-rows: repeat(1, 18px);
+ -webkit-grid-template-columns: repeat(1, 15%);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoSingleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, auto);
- -webkit-grid-definition-columns: repeat(2, minmax(15px, 50%));
</del><ins>+ -webkit-grid-template-rows: repeat(2, auto);
+ -webkit-grid-template-columns: repeat(2, minmax(15px, 50%));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, minmax(5px, 10px) auto);
- -webkit-grid-definition-columns: repeat(2, auto minmax(100px, 120px));
</del><ins>+ -webkit-grid-template-rows: repeat(2, minmax(5px, 10px) auto);
+ -webkit-grid-template-columns: repeat(2, auto minmax(100px, 120px));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackWithNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 10px 'start' auto 'end');
- -webkit-grid-definition-columns: repeat(2, auto 'middle' 250px 'end');
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px 'start' auto 'end');
+ -webkit-grid-template-columns: repeat(2, auto 'middle' 250px 'end');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackWithTrailingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 'before' 10px);
- -webkit-grid-definition-columns: repeat(2, 'before' auto);
</del><ins>+ -webkit-grid-template-rows: repeat(2, 'before' 10px);
+ -webkit-grid-template-columns: repeat(2, 'before' auto);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .trailingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(1, 10px) 'end';
- -webkit-grid-definition-columns: repeat(1, 250px) 'end';
</del><ins>+ -webkit-grid-template-rows: repeat(1, 10px) 'end';
+ -webkit-grid-template-columns: repeat(1, 250px) 'end';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .leadingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: 'start' repeat(2, 10px);
- -webkit-grid-definition-columns: 'start' repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: 'start' repeat(2, 10px);
+ -webkit-grid-template-columns: 'start' repeat(2, 250px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mixRepeatAfterNonRepeat {
</span><del>- -webkit-grid-definition-rows: auto repeat(2, 10px);
- -webkit-grid-definition-columns: 'start' 140px repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: auto repeat(2, 10px);
+ -webkit-grid-template-columns: 'start' 140px repeat(2, 250px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mixNonRepeatAfterRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 10px) 'end' auto;
- -webkit-grid-definition-columns: repeat(2, 250px) 15% 'last';
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px) 'end' auto;
+ -webkit-grid-template-columns: repeat(2, 250px) 15% 'last';
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="lines">@@ -99,19 +99,19 @@
</span><span class="cx">
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><del>- description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
</del><ins>+ description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected');
</ins><span class="cx">
</span><del>- debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
- testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWithSize"), "120px", "18px");
- testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "400px 400px", "0px 0px");
- testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeatWithChildren"), "400px 400px", "44px 77px");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "33px 120px 0px 120px", "10px 77px 10px 0px");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithNamedGridLineRepeat"), "33px middle 250px end 0px middle 250px end", "10px start 77px end 10px start 0px end");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithTrailingNamedGridLineRepeat"), "before 0px before 0px", "before 10px before 10px");
- testGridDefinitionsValues(document.getElementById("trailingNamedGridLineRepeat"), "250px end", "10px end");
- testGridDefinitionsValues(document.getElementById("leadingNamedGridLineRepeat"), "start 250px 250px", "start 10px 10px");
- testGridDefinitionsValues(document.getElementById("mixRepeatAfterNonRepeat"), "start 140px 250px 250px", "44px 10px 10px");
- testGridDefinitionsValues(document.getElementById("mixNonRepeatAfterRepeat"), "250px 250px 120px last", "10px 10px end 0px");
</del><ins>+ debug("Test getting grid-template-columns and grid-template-rows set through CSS");
+ testGridTemplatesValues(document.getElementById("singleSingleTrackRepeatWithSize"), "120px", "18px");
+ testGridTemplatesValues(document.getElementById("twoSingleTrackRepeat"), "400px 400px", "0px 0px");
+ testGridTemplatesValues(document.getElementById("twoSingleTrackRepeatWithChildren"), "400px 400px", "44px 77px");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackRepeat"), "33px 120px 0px 120px", "10px 77px 10px 0px");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackWithNamedGridLineRepeat"), "33px middle 250px end 0px middle 250px end", "10px start 77px end 10px start 0px end");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackWithTrailingNamedGridLineRepeat"), "before 0px before 0px", "before 10px before 10px");
+ testGridTemplatesValues(document.getElementById("trailingNamedGridLineRepeat"), "250px end", "10px end");
+ testGridTemplatesValues(document.getElementById("leadingNamedGridLineRepeat"), "start 250px 250px", "start 10px 10px");
+ testGridTemplatesValues(document.getElementById("mixRepeatAfterNonRepeat"), "start 140px 250px 250px", "44px 10px 10px");
+ testGridTemplatesValues(document.getElementById("mixNonRepeatAfterRepeat"), "250px 250px 120px last", "10px 10px end 0px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test invalid repeat syntax.");
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx"> element.style.gridColumns = gridColumn;
</span><del>- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "none");
</del><ins>+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
</ins><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> testInvalidSyntax("repeat(");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemadditionautoplacementupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemadditiontrackbreadthupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><del>- -webkit-grid-definition-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- -webkit-grid-definition-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
+ -webkit-grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .sizedToGridArea {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-rows: 10px 20px;
- -webkit-grid-definition-columns: 30px 40px;
</del><ins>+ -webkit-grid-template-rows: 10px 20px;
+ -webkit-grid-template-columns: 30px 40px;
</ins><span class="cx"> -webkit-grid-auto-flow: row;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditembadresolutiondoublespanhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid-definition-rows: "firstRow" 10px 20px;
- -webkit-grid-definition-columns: "firstColumn" 30px 40px;
</del><ins>+ -webkit-grid-template-rows: "firstRow" 10px 20px;
+ -webkit-grid-template-columns: "firstColumn" 30px 40px;
</ins><span class="cx"> -webkit-grid-auto-flow: row;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemchangecolumnrepainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> .grid {
</span><span class="cx"> width: -webkit-fit-content;
</span><del>- -webkit-grid-definition-rows: 50px;
- -webkit-grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
</del><ins>+ -webkit-grid-template-rows: 50px;
+ -webkit-grid-template-columns: minmax(100px, 180px) 100px minmax(50px, 100px);
</ins><span class="cx"> }
</span><span class="cx"> .sizedToGridArea {
</span><span class="cx"> background-color: purple;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemchangerowrepainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid-definition-rows: 50px 100px;
- -webkit-grid-definition-columns: 100px 50px;
</del><ins>+ -webkit-grid-template-rows: 50px 100px;
+ -webkit-grid-template-columns: 100px 50px;
</ins><span class="cx"> /* Make the grid shrink to fit. */
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmarginresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -9,8 +9,8 @@
</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-definition-rows: 100px 100px;
- -webkit-grid-definition-columns: 100px 100px;
</del><ins>+ -webkit-grid-template-rows: 100px 100px;
+ -webkit-grid-template-columns: 100px 100px;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmultipleminmaxcontentresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxAutoWithColumnMinMaxAuto {
</span><del>- -webkit-grid-definition-columns: minmax(50px, 180px) auto;
- -webkit-grid-definition-rows: auto minmax(50px, 100px);
</del><ins>+ -webkit-grid-template-columns: minmax(50px, 180px) auto;
+ -webkit-grid-template-rows: auto minmax(50px, 100px);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</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 (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</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-definition-rows: "before" 50px "middle" 100px "after";
- -webkit-grid-definition-columns: 40px 80px 160px;
</del><ins>+ -webkit-grid-template-rows: "before" 50px "middle" 100px "after";
+ -webkit-grid-template-columns: 40px 80px 160px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithoutRepeat {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnamedgridlineresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,13 +8,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridWithoutRepeat {
</span><del>- -webkit-grid-definition-columns: 'a' 50px 'b' 100px 'c' 200px 'd';
- -webkit-grid-definition-rows: 'e' 50px 'f' 100px 'g' 200px 'h';
</del><ins>+ -webkit-grid-template-columns: 'a' 50px 'b' 100px 'c' 200px 'd';
+ -webkit-grid-template-rows: 'e' 50px 'f' 100px 'g' 200px 'h';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithRepeat {
</span><del>- -webkit-grid-definition-columns: 'b' 50px 'b' 100px 'b' 200px 'b';
- -webkit-grid-definition-rows: 'g' 50px 'g' 100px 'g' 200px 'g';
</del><ins>+ -webkit-grid-template-columns: 'b' 50px 'b' 100px 'b' 200px 'b';
+ -webkit-grid-template-rows: 'g' 50px 'g' 100px 'g' 200px 'g';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridItemBToD {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnegativeintegerexplicitgridresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,14 +7,14 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .columnGrid {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- /* -webkit-grid-definition-rows is left unset so that the grid items' row is implicit. */
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ /* -webkit-grid-template-rows is left unset so that the grid items' row is implicit. */
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rowGrid {
</span><del>- -webkit-grid-definition-rows: 50px 100px;
- /* -webkit-grid-definition-columns is left unset so that the grid items' column is implicit. */
</del><ins>+ -webkit-grid-template-rows: 50px 100px;
+ /* -webkit-grid-template-columns is left unset so that the grid items' column is implicit. */
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnegativepositionresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 'first' 50px 'middle' 100px 'last';
- -webkit-grid-definition-rows: 'first' 50px 'middle' 100px 'last';
</del><ins>+ -webkit-grid-template-columns: 'first' 50px 'middle' 100px 'last';
+ -webkit-grid-template-rows: 'first' 50px 'middle' 100px 'last';
</ins><span class="cx"> /* To detect how much we extend the grid. */
</span><span class="cx"> -webkit-grid-auto-columns: 200px;
</span><span class="cx"> -webkit-grid-auto-rows: 200px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemorderautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .negativeOrder {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemorderpaintorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> display: -webkit-grid;
</span><del>- -webkit-grid-definition-rows: 100px;
- -webkit-grid-definition-columns: 100px;
</del><ins>+ -webkit-grid-template-rows: 100px;
+ -webkit-grid-template-columns: 100px;
</ins><span class="cx"> width: -webkit-fit-content;
</span><span class="cx"> }
</span><span class="cx"> .sizedToGridArea {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemremovalautoplacementupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemremovaltrackbreadthupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,28 +7,28 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><del>- -webkit-grid-definition-columns: auto;
- -webkit-grid-definition-rows: auto;
</del><ins>+ -webkit-grid-template-columns: auto;
+ -webkit-grid-template-rows: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinContentFixed {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 100px);
- -webkit-grid-definition-rows: minmax(-webkit-min-content, 40px);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 100px);
+ -webkit-grid-template-rows: minmax(-webkit-min-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxContentFixed {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-max-content, 150px);
- -webkit-grid-definition-rows: minmax(-webkit-max-content, 40px);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-max-content, 150px);
+ -webkit-grid-template-rows: minmax(-webkit-max-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMinContent {
</span><del>- -webkit-grid-definition-columns: minmax(100px, -webkit-min-content);
- -webkit-grid-definition-rows: minmax(40px, -webkit-min-content);
</del><ins>+ -webkit-grid-template-columns: minmax(100px, -webkit-min-content);
+ -webkit-grid-template-rows: minmax(40px, -webkit-min-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(100px, -webkit-max-content);
- -webkit-grid-definition-rows: minmax(40px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: minmax(100px, -webkit-max-content);
+ -webkit-grid-template-rows: minmax(40px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .lessConstrainedContainer {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemspanningresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,15 +7,15 @@
</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-definition-columns: 40% 60%;
- -webkit-grid-definition-rows: 30% 70%;
</del><ins>+ -webkit-grid-template-columns: 40% 60%;
+ -webkit-grid-template-rows: 30% 70%;
</ins><span class="cx"> width: 400px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #bigGrid {
</span><del>- -webkit-grid-definition-columns: 25% 25% 25% 25%;
- -webkit-grid-definition-rows: 25% 25% 25% 25%;
</del><ins>+ -webkit-grid-template-columns: 25% 25% 25% 25%;
+ -webkit-grid-template-rows: 25% 25% 25% 25%;
</ins><span class="cx"> height: 100px;
</span><span class="cx"> width: 200px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithpercentheightinautoheightgridresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxMinMax {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoAuto {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: auto auto;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: auto auto;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithpercentminmaxheightdynamichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 70px 140px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 70px 140px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #minHeightPercent {
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> function testLayout(gridElementID, gridTracks, size)
</span><span class="cx"> {
</span><span class="cx"> var gridElement = document.getElementById(gridElementID);
</span><del>- gridElement.style.webkitGridDefinitionRows = gridTracks.rows;
</del><ins>+ gridElement.style.webkitGridTemplateRows = gridTracks.rows;
</ins><span class="cx"> var gridItem = gridElement.firstChild.nextSibling;
</span><span class="cx"> gridItem.setAttribute("data-expected-width", size.width);
</span><span class="cx"> gridItem.setAttribute("data-expected-height", size.height);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpreferredlogicalwidthshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -9,37 +9,37 @@
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinContentFixed {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMinContent {
</span><del>- -webkit-grid-definition-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedFixed {
</span><del>- -webkit-grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px);
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: minmax(30px, 40px) minmax(30px, 40px);
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoContent {
</span><del>- -webkit-grid-definition-columns: auto auto;
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: auto auto;
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedFraction {
</span><del>- -webkit-grid-definition-columns: minmax(10px, 1fr) minmax(2fr, 20px);
- -webkit-grid-definition-rows: 10px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 1fr) minmax(2fr, 20px);
+ -webkit-grid-template-rows: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .margins {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitcolumnsautoresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><del>- /* -webkit-grid-definition-columns is left unset so that the grid item's column is implicit. */
- -webkit-grid-definition-rows: 50px;
</del><ins>+ /* -webkit-grid-template-columns is left unset so that the grid item's column is implicit. */
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitpositiondynamicchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><del>- -webkit-grid-definition-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- -webkit-grid-definition-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
+ -webkit-grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitrowsautoresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><del>- -webkit-grid-definition-columns: 50px;
- /* -webkit-grid-definition-rows is left unset so that the grid item's row is implicit. */
</del><ins>+ -webkit-grid-template-columns: 50px;
+ /* -webkit-grid-template-rows is left unset so that the grid item's row is implicit. */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxfixedlogicalheightonlyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -12,38 +12,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid1 {
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(20px, 80px) 160px;
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(20px, 80px) 160px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid2 {
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(50%, 120px) minmax(20px, 40%);
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(50%, 120px) minmax(20px, 40%);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid3 {
</span><del>- -webkit-grid-definition-columns: 30px;
</del><ins>+ -webkit-grid-template-columns: 30px;
</ins><span class="cx"> /* Overlapping range. */
</span><del>- -webkit-grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px);
</del><ins>+ -webkit-grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid4 {
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(20px, 80px) 60px;
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(20px, 80px) 60px;
</ins><span class="cx"> -webkit-writing-mode: vertical-rl;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid5 {
</span><del>- -webkit-grid-definition-columns: 30px;
</del><ins>+ -webkit-grid-template-columns: 30px;
</ins><span class="cx"> /* 90% > 80px, 80px should be ignored. */
</span><del>- -webkit-grid-definition-rows: minmax(90%, 80px) minmax(10px, 60%);
</del><ins>+ -webkit-grid-template-rows: minmax(90%, 80px) minmax(10px, 60%);
</ins><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid6 {
</span><span class="cx"> /* Overlapping range. */
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px);
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(10px, 180px) minmax(30px, 150px);
</ins><span class="cx"> -webkit-writing-mode: horizontal-bt;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxfixedlogicalwidthonlyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -12,39 +12,39 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid1 {
</span><del>- -webkit-grid-definition-columns: minmax(20px, 80px) 60px;
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(20px, 80px) 60px;
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid2 {
</span><span class="cx"> /* First minmax more constraining than available logical width. */
</span><del>- -webkit-grid-definition-columns: minmax(50%, 60px) minmax(10px, 40%);
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(50%, 60px) minmax(10px, 40%);
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid3 {
</span><span class="cx"> /* Overlapping range. */
</span><del>- -webkit-grid-definition-columns: minmax(10px, 80px) minmax(20px, 50px);
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 80px) minmax(20px, 50px);
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid4 {
</span><del>- -webkit-grid-definition-columns: minmax(20px, 80px) 160px;
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(20px, 80px) 160px;
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> -webkit-writing-mode: vertical-rl;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid5 {
</span><span class="cx"> /* 50% > 80px, 80px should be ignored. */
</span><del>- -webkit-grid-definition-columns: minmax(50%, 80px) minmax(10px, 60%);
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(50%, 80px) minmax(10px, 60%);
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> -webkit-writing-mode: vertical-lr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #grid6 {
</span><span class="cx"> /* Overlapping range. */
</span><del>- -webkit-grid-definition-columns: minmax(10px, 180px) minmax(30px, 150px);
- -webkit-grid-definition-rows: 30px;
</del><ins>+ -webkit-grid-template-columns: minmax(10px, 180px) minmax(30px, 150px);
+ -webkit-grid-template-rows: 30px;
</ins><span class="cx"> -webkit-writing-mode: horizontal-bt;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-max-content, 50px);
- -webkit-grid-definition-rows: 60px;
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-max-content, 50px);
+ -webkit-grid-template-rows: 60px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(30px, -webkit-max-content);
- -webkit-grid-definition-rows: 20px;
</del><ins>+ -webkit-grid-template-columns: minmax(30px, -webkit-max-content);
+ -webkit-grid-template-rows: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxContent {
</span><del>- -webkit-grid-definition-columns: 20px;
- -webkit-grid-definition-rows: minmax(-webkit-max-content, 50px);
</del><ins>+ -webkit-grid-template-columns: 20px;
+ -webkit-grid-template-rows: minmax(-webkit-max-content, 50px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- -webkit-grid-definition-columns: 20px;
- -webkit-grid-definition-rows: minmax(30px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: 20px;
+ -webkit-grid-template-rows: minmax(30px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 40px);
- -webkit-grid-definition-rows: 50px;
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 40px);
+ -webkit-grid-template-rows: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><del>- -webkit-grid-definition-columns: minmax(30px, -webkit-min-content);
- -webkit-grid-definition-rows: 20px;
</del><ins>+ -webkit-grid-template-columns: minmax(30px, -webkit-min-content);
+ -webkit-grid-template-rows: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(-webkit-min-content, 40px);
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(-webkit-min-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><del>- -webkit-grid-definition-columns: 30px;
- -webkit-grid-definition-rows: minmax(30px, -webkit-min-content);
</del><ins>+ -webkit-grid-template-columns: 30px;
+ -webkit-grid-template-rows: minmax(30px, -webkit-min-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,23 +7,23 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoAutoContent {
</span><del>- -webkit-grid-definition-columns: auto auto;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: auto auto;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedAutoContent {
</span><del>- -webkit-grid-definition-columns: 10px auto;
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: 10px auto;
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMin {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMax {
</span><del>- -webkit-grid-definition-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
- -webkit-grid-definition-rows: 50px 100px;
</del><ins>+ -webkit-grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
+ -webkit-grid-template-rows: 50px 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,23 +7,23 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridAutoAutoContent {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: auto auto;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: auto auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedAutoContent {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: 10px auto;
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: 10px auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMin {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMax {
</span><del>- -webkit-grid-definition-columns: 50px 100px;
- -webkit-grid-definition-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: 50px 100px;
+ -webkit-grid-template-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,79 +1,79 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "first 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "first 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "424px last"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "162px last"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "first 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "0px last"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-columns') is "first 77px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-definition-rows') is "22px last"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is "first 80px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is "300px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 10px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-definition-rows') is "nav first 15px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 80px nav 120px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-definition-rows') is "first nav2 150px nav2 450px last"
</del><ins>+Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "first 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "first 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "424px last"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "162px last"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "first 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "0px last"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-columns') is "first 77px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPropertyValue('-webkit-grid-template-rows') is "22px last"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "first 80px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "300px last"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 10px last"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "nav first 15px last"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 80px nav 120px last"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-rows') is "first nav2 150px nav2 450px last"
</ins><span class="cx">
</span><del>-Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 18px"
-PASS element.style.webkitGridDefinitionColumns is "first 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px last"
-PASS element.style.webkitGridDefinitionRows is "66px last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 440px"
-PASS element.style.webkitGridDefinitionColumns is "first 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "240px last"
-PASS element.style.webkitGridDefinitionRows is "40% last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 0px"
-PASS element.style.webkitGridDefinitionColumns is "first auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px last"
-PASS element.style.webkitGridDefinitionRows is "auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 0px"
-PASS element.style.webkitGridDefinitionColumns is "first -webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px last"
-PASS element.style.webkitGridDefinitionRows is "-webkit-min-content last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 0px"
-PASS element.style.webkitGridDefinitionColumns is "first -webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px last"
-PASS element.style.webkitGridDefinitionRows is "-webkit-max-content last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 440px"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "240px last"
-PASS element.style.webkitGridDefinitionRows is "minmax(30px, 40%) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 220px"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "50px last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 220px"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(22em, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "50px last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-min-content, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 0px"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "0px last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 0px last"
-PASS element.style.webkitGridDefinitionColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "nav first 0px last"
-PASS element.style.webkitGridDefinitionRows is "first nav minmax(-webkit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 0px nav 0px last"
-PASS element.style.webkitGridDefinitionColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "first nav2 0px nav2 15px last"
-PASS element.style.webkitGridDefinitionRows is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "foo bar 0px foo 0px bar"
-PASS element.style.webkitGridDefinitionColumns is "foo bar auto foo auto bar"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "foo bar 0px foo 0px bar"
-PASS element.style.webkitGridDefinitionRows is "foo bar auto foo auto bar"
</del><ins>+Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 18px"
+PASS element.style.webkitGridTemplateColumns is "first 18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px last"
+PASS element.style.webkitGridTemplateRows is "66px last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 440px"
+PASS element.style.webkitGridTemplateColumns is "first 55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px last"
+PASS element.style.webkitGridTemplateRows is "40% last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 0px"
+PASS element.style.webkitGridTemplateColumns is "first auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px last"
+PASS element.style.webkitGridTemplateRows is "auto last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 0px"
+PASS element.style.webkitGridTemplateColumns is "first -webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px last"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 0px"
+PASS element.style.webkitGridTemplateColumns is "first -webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px last"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 440px"
+PASS element.style.webkitGridTemplateColumns is "first minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "240px last"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 220px"
+PASS element.style.webkitGridTemplateColumns is "first minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 220px"
+PASS element.style.webkitGridTemplateColumns is "first minmax(22em, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "50px last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-content, 5em) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 0px"
+PASS element.style.webkitGridTemplateColumns is "first minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "0px last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 0px last"
+PASS element.style.webkitGridTemplateColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "nav first 0px last"
+PASS element.style.webkitGridTemplateRows is "first nav minmax(-webkit-max-content, -webkit-min-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 0px nav 0px last"
+PASS element.style.webkitGridTemplateColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "first nav2 0px nav2 15px last"
+PASS element.style.webkitGridTemplateRows is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "foo bar 0px foo 0px bar"
+PASS element.style.webkitGridTemplateColumns is "foo bar auto foo auto bar"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "foo bar 0px foo 0px bar"
+PASS element.style.webkitGridTemplateRows is "foo bar auto foo auto bar"
</ins><span class="cx">
</span><del>-Test getting and setting invalid -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -19,28 +19,28 @@
</span><span class="cx"> width: 77px;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: "first" 10px;
- -webkit-grid-definition-rows: "first" 15px;
</del><ins>+ -webkit-grid-template-columns: "first" 10px;
+ -webkit-grid-template-rows: "first" 15px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53% "last";
- -webkit-grid-definition-rows: 27% "last";
</del><ins>+ -webkit-grid-template-columns: 53% "last";
+ -webkit-grid-template-rows: 27% "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: "first" auto;
- -webkit-grid-definition-rows: auto "last";
</del><ins>+ -webkit-grid-template-columns: "first" auto;
+ -webkit-grid-template-rows: auto "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMax {
</span><del>- -webkit-grid-definition-columns: "first" minmax(10%, 15px);
- -webkit-grid-definition-rows: minmax(20px, 50%) "last";
</del><ins>+ -webkit-grid-template-columns: "first" minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%) "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFixedMultiple {
</span><del>- -webkit-grid-definition-columns: "first" "nav" 10px "last";
- -webkit-grid-definition-rows: "first" "nav" 15px "last";
</del><ins>+ -webkit-grid-template-columns: "first" "nav" 10px "last";
+ -webkit-grid-template-rows: "first" "nav" 15px "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercentageSameStringMultipleTimes {
</span><del>- -webkit-grid-definition-columns: "first" "nav" 10% "nav" 15% "last";
- -webkit-grid-definition-rows: "first" "nav2" 25% "nav2" 75% "last";
</del><ins>+ -webkit-grid-template-columns: "first" "nav" 10% "nav" 15% "last";
+ -webkit-grid-template-rows: "first" "nav2" 25% "nav2" 75% "last";
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="lines">@@ -57,36 +57,36 @@
</span><span class="cx"> <div class="grid gridWithPercentageSameStringMultipleTimes" id="gridWithPercentageSameStringMultipleTimes"></div>
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><del>- description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+ description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>- debug("Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS");
- testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "first 10px", "first 15px");
- testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "424px last", "162px last");
- testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "first 0px", "0px last");
- testGridDefinitionsValues(document.getElementById("gridWithAutoWithChildrenElement"), "first 77px", "22px last");
- testGridDefinitionsValues(document.getElementById("gridWithMinMax"), "first 80px", "300px last");
- testGridDefinitionsValues(document.getElementById("gridWithFixedMultiple"), "nav first 10px last", "nav first 15px last");
- testGridDefinitionsValues(document.getElementById("gridWithPercentageSameStringMultipleTimes"), "nav first 80px nav 120px last", "first nav2 150px nav2 450px last");
</del><ins>+ debug("Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS");
+ testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "first 10px", "first 15px");
+ testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px last", "162px last");
+ testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "first 0px", "0px last");
+ testGridTemplatesValues(document.getElementById("gridWithAutoWithChildrenElement"), "first 77px", "22px last");
+ testGridTemplatesValues(document.getElementById("gridWithMinMax"), "first 80px", "300px last");
+ testGridTemplatesValues(document.getElementById("gridWithFixedMultiple"), "nav first 10px last", "nav first 15px last");
+ testGridTemplatesValues(document.getElementById("gridWithPercentageSameStringMultipleTimes"), "nav first 80px nav 120px last", "first nav2 150px nav2 450px last");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>- debug("Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS");
- testGridDefinitionsSetJSValues("'first' 18px", "66px 'last'", "first 18px", "66px last", "first 18px", "66px last");
- testGridDefinitionsSetJSValues("'first' 55%", "40% 'last'", "first 440px", "240px last", "first 55%", "40% last");
- testGridDefinitionsSetJSValues("'first' auto", "auto 'last'", "first 0px", "0px last", "first auto", "auto last");
- testGridDefinitionsSetJSValues("'first' -webkit-min-content", "-webkit-min-content 'last'", "first 0px", "0px last", "first -webkit-min-content", "-webkit-min-content last");
- testGridDefinitionsSetJSValues("'first' -webkit-max-content", "-webkit-max-content 'last'", "first 0px", "0px last", "first -webkit-max-content", "-webkit-max-content last");
- testGridDefinitionsSetJSValues("'first' minmax(55%, 45px)", "minmax(30px, 40%) 'last'", "first 440px", "240px last", "first minmax(55%, 45px)", "minmax(30px, 40%) last");
- testGridDefinitionsSetJSValues("'first' minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) 'last'", "first 220px", "50px last", "first minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) last");
- testGridDefinitionsSetJSValues("'first' minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) 'last'", "first 220px", "50px last", "first minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) last");
- testGridDefinitionsSetJSValues("'first' minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) 'last'", "first 0px", "0px last", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last");
- testGridDefinitionsSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'", "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'", "nav first 0px last", "nav first 0px last", "first nav minmax(-webkit-min-content, -webkit-max-content) last", "first nav minmax(-webkit-max-content, -webkit-min-content) last");
- testGridDefinitionsSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'", "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'", "nav first 0px nav 0px last", "first nav2 0px nav2 15px last", "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last");
- testGridDefinitionsSetJSValues("'foo' 'bar' auto 'foo' auto 'bar'", "'foo' 'bar' auto 'foo' auto 'bar'", "foo bar 0px foo 0px bar", "foo bar 0px foo 0px bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar");
</del><ins>+ debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+ testGridTemplatesSetJSValues("'first' 18px", "66px 'last'", "first 18px", "66px last", "first 18px", "66px last");
+ testGridTemplatesSetJSValues("'first' 55%", "40% 'last'", "first 440px", "240px last", "first 55%", "40% last");
+ testGridTemplatesSetJSValues("'first' auto", "auto 'last'", "first 0px", "0px last", "first auto", "auto last");
+ testGridTemplatesSetJSValues("'first' -webkit-min-content", "-webkit-min-content 'last'", "first 0px", "0px last", "first -webkit-min-content", "-webkit-min-content last");
+ testGridTemplatesSetJSValues("'first' -webkit-max-content", "-webkit-max-content 'last'", "first 0px", "0px last", "first -webkit-max-content", "-webkit-max-content last");
+ testGridTemplatesSetJSValues("'first' minmax(55%, 45px)", "minmax(30px, 40%) 'last'", "first 440px", "240px last", "first minmax(55%, 45px)", "minmax(30px, 40%) last");
+ testGridTemplatesSetJSValues("'first' minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) 'last'", "first 220px", "50px last", "first minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) last");
+ testGridTemplatesSetJSValues("'first' minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) 'last'", "first 220px", "50px last", "first minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) last");
+ testGridTemplatesSetJSValues("'first' minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) 'last'", "first 0px", "0px last", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last");
+ testGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'", "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'", "nav first 0px last", "nav first 0px last", "first nav minmax(-webkit-min-content, -webkit-max-content) last", "first nav minmax(-webkit-max-content, -webkit-min-content) last");
+ testGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'", "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'", "nav first 0px nav 0px last", "first nav2 0px nav2 15px last", "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last");
+ testGridTemplatesSetJSValues("'foo' 'bar' auto 'foo' auto 'bar'", "'foo' 'bar' auto 'foo' auto 'bar'", "foo bar 0px foo 0px bar", "foo bar 0px foo 0px bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>- debug("Test getting and setting invalid -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS");
- testGridDefinitionsSetBadJSValues("foo", "bar");
- testGridDefinitionsSetBadJSValues("foo bar", "bar foo");
</del><ins>+ debug("Test getting and setting invalid -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+ testGridTemplatesSetBadJSValues("foo", "bar");
+ testGridTemplatesSetBadJSValues("foo bar", "bar foo");
</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="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,145 +1,145 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "53%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "27%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is "100px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is "150px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-columns') is "64px"
-PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-rows') is "60px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(20px, 50%)"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-columns') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is "-webkit-max-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-max-content"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-definition-columns') is "1fr"
-PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-definition-rows') is "2fr"
</del><ins>+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-columns') is "64px"
+PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-template-rows') is "60px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%)"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-max-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-template-columns') is "1fr"
+PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('-webkit-grid-template-rows') is "2fr"
</ins><span class="cx">
</span><del>-Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx">
</span><del>-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px"
-PASS element.style.webkitGridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px"
-PASS element.style.webkitGridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "55%"
-PASS element.style.webkitGridDefinitionColumns is "55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "40%"
-PASS element.style.webkitGridDefinitionRows is "40%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "auto"
-PASS element.style.webkitGridDefinitionColumns is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "auto"
-PASS element.style.webkitGridDefinitionRows is "auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "80px"
-PASS element.style.webkitGridDefinitionColumns is "10vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "150px"
-PASS element.style.webkitGridDefinitionRows is "25vh"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "-webkit-min-content"
-PASS element.style.webkitGridDefinitionColumns is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-min-content"
-PASS element.style.webkitGridDefinitionRows is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "-webkit-max-content"
-PASS element.style.webkitGridDefinitionColumns is "-webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-max-content"
-PASS element.style.webkitGridDefinitionRows is "-webkit-max-content"
</del><ins>+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
+PASS element.style.webkitGridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
+PASS element.style.webkitGridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "55%"
+PASS element.style.webkitGridTemplateColumns is "55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40%"
+PASS element.style.webkitGridTemplateRows is "40%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto"
+PASS element.style.webkitGridTemplateColumns is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto"
+PASS element.style.webkitGridTemplateRows is "auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "80px"
+PASS element.style.webkitGridTemplateColumns is "10vw"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "150px"
+PASS element.style.webkitGridTemplateRows is "25vh"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content"
+PASS element.style.webkitGridTemplateColumns is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-max-content"
+PASS element.style.webkitGridTemplateColumns is "-webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content"
</ins><span class="cx">
</span><del>-Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(55%, 45px)"
-PASS element.style.webkitGridDefinitionColumns is "minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(30px, 40%)"
-PASS element.style.webkitGridDefinitionRows is "minmax(30px, 40%)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(220px, 48px)"
-PASS element.style.webkitGridDefinitionColumns is "minmax(22em, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(80px, 50px)"
-PASS element.style.webkitGridDefinitionRows is "minmax(10vw, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(-webkit-min-content, 48px)"
-PASS element.style.webkitGridDefinitionColumns is "minmax(-webkit-min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(80px, -webkit-min-content)"
-PASS element.style.webkitGridDefinitionRows is "minmax(10vw, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(220px, -webkit-max-content)"
-PASS element.style.webkitGridDefinitionColumns is "minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(-webkit-max-content, 50px)"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.webkitGridDefinitionColumns is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "3600fr"
-PASS element.style.webkitGridDefinitionColumns is "3600fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "154fr"
-PASS element.style.webkitGridDefinitionRows is "154fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "3.1459fr"
-PASS element.style.webkitGridDefinitionColumns is "3.1459fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "2.718fr"
-PASS element.style.webkitGridDefinitionRows is "2.718fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "3fr"
-PASS element.style.webkitGridDefinitionColumns is "3fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "4fr"
-PASS element.style.webkitGridDefinitionRows is "4fr"
</del><ins>+Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(55%, 45px)"
+PASS element.style.webkitGridTemplateColumns is "minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(30px, 40%)"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(220px, 48px)"
+PASS element.style.webkitGridTemplateColumns is "minmax(22em, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, 50px)"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 48px)"
+PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(80px, -webkit-min-content)"
+PASS element.style.webkitGridTemplateRows is "minmax(10vw, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(220px, -webkit-max-content)"
+PASS element.style.webkitGridTemplateColumns is "minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, 50px)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS element.style.webkitGridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3600fr"
+PASS element.style.webkitGridTemplateColumns is "3600fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "154fr"
+PASS element.style.webkitGridTemplateRows is "154fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3.1459fr"
+PASS element.style.webkitGridTemplateColumns is "3.1459fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "2.718fr"
+PASS element.style.webkitGridTemplateRows is "2.718fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "3fr"
+PASS element.style.webkitGridTemplateColumns is "3fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "4fr"
+PASS element.style.webkitGridTemplateRows is "4fr"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to bad values through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test setting grid-template-columns and grid-template-rows to bad values through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px"
-PASS element.style.webkitGridDefinitionColumns is "18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px"
-PASS element.style.webkitGridDefinitionRows is "66px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS element.style.webkitGridDefinitionColumns is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS element.style.webkitGridDefinitionRows is "none"
</del><ins>+Test setting grid-template-columns and grid-template-rows back to 'none' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px"
+PASS element.style.webkitGridTemplateColumns is "18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px"
+PASS element.style.webkitGridTemplateRows is "66px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS element.style.webkitGridTemplateColumns is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS element.style.webkitGridTemplateRows is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '50px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'first 101%'
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '50px last'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'first 101%'
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '150% last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'first 1fr'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is '150% last'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'first 1fr'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,105 +1,105 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "7px 11px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "17px 2px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "53% 99%"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "27% 52%"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "auto auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "auto auto"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is "100px 120px"
-PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is "150px 170px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-columns') is "15px auto 100px"
-PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-rows') is "120px 18px auto"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-columns') is "50% 120px"
-PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-rows') is "35% 168px"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is "-webkit-min-content -webkit-max-content"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-max-content -webkit-min-content"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(45px, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is "120px minmax(35%, 10px)"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(-webkit-min-content, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is "120px minmax(35%, -webkit-max-content)"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-definition-columns') is "1fr 2fr"
-PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-definition-rows') is "3fr 4fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(-webkit-min-content, 45px) 2fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is "3fr minmax(14px, -webkit-max-content)"
</del><ins>+Test getting |grid-template-columns| and |grid-template-rows| set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "7px 11px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "17px 2px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53% 99%"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27% 52%"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "auto auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-columns') is "100px 120px"
+PASS window.getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-template-rows') is "150px 170px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-columns') is "15px auto 100px"
+PASS window.getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-template-rows') is "120px 18px auto"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-columns') is "50% 120px"
+PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-template-rows') is "35% 168px"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "-webkit-min-content -webkit-max-content"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content -webkit-min-content"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(45px, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is "120px minmax(35%, 10px)"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-template-rows') is "120px minmax(35%, -webkit-max-content)"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-columns') is "1fr 2fr"
+PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('-webkit-grid-template-rows') is "3fr 4fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(-webkit-min-content, 45px) 2fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "3fr minmax(14px, -webkit-max-content)"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx">
</span><del>-Test getting and setting grid-definition-rows and grid-definition-columns through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "18px 22px"
-PASS element.style.webkitGridDefinitionColumns is "18px 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px 70px"
-PASS element.style.webkitGridDefinitionRows is "66px 70px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "55% 80%"
-PASS element.style.webkitGridDefinitionColumns is "55% 80%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "40% 63%"
-PASS element.style.webkitGridDefinitionRows is "40% 63%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "auto auto"
-PASS element.style.webkitGridDefinitionColumns is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "auto auto"
-PASS element.style.webkitGridDefinitionRows is "auto auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "auto 160px 22px"
-PASS element.style.webkitGridDefinitionColumns is "auto 16em 22px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "56% 100px auto"
-PASS element.style.webkitGridDefinitionRows is "56% 10em auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "160px minmax(16px, 20px)"
-PASS element.style.webkitGridDefinitionColumns is "16em minmax(16px, 20px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(10%, 15%) auto"
-PASS element.style.webkitGridDefinitionRows is "minmax(10%, 15%) auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "160px 2fr"
-PASS element.style.webkitGridDefinitionColumns is "16em 2fr"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "14fr auto"
-PASS element.style.webkitGridDefinitionRows is "14fr auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "50% 96px"
-PASS element.style.webkitGridDefinitionColumns is "50% 12vw"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "5% 510px"
-PASS element.style.webkitGridDefinitionRows is "5% 85vh"
</del><ins>+Test getting and setting grid-template-rows and grid-template-columns through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "18px 22px"
+PASS element.style.webkitGridTemplateColumns is "18px 22px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px 70px"
+PASS element.style.webkitGridTemplateRows is "66px 70px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "55% 80%"
+PASS element.style.webkitGridTemplateColumns is "55% 80%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40% 63%"
+PASS element.style.webkitGridTemplateRows is "40% 63%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto auto"
+PASS element.style.webkitGridTemplateColumns is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
+PASS element.style.webkitGridTemplateRows is "auto auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "auto 160px 22px"
+PASS element.style.webkitGridTemplateColumns is "auto 16em 22px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "56% 100px auto"
+PASS element.style.webkitGridTemplateRows is "56% 10em auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px minmax(16px, 20px)"
+PASS element.style.webkitGridTemplateColumns is "16em minmax(16px, 20px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(10%, 15%) auto"
+PASS element.style.webkitGridTemplateRows is "minmax(10%, 15%) auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "160px 2fr"
+PASS element.style.webkitGridTemplateColumns is "16em 2fr"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "14fr auto"
+PASS element.style.webkitGridTemplateRows is "14fr auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50% 96px"
+PASS element.style.webkitGridTemplateColumns is "50% 12vw"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "5% 510px"
+PASS element.style.webkitGridTemplateRows is "5% 85vh"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values set from CSS
</span><del>-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx">
</span><span class="cx"> Test setting and getting wrong values from JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "50px 1fr last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "101% middle 45px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "50px 1fr last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "101% middle 45px"
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'inherit' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 1fr last"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "101% middle 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "50px 1fr last"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "101% middle 45px"
</ins><span class="cx">
</span><del>-Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "150% middle 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "1fr line 2fr line"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none'
</del><ins>+Test setting grid-template-columns and grid-template-rows to 'initial' through JS
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "150% middle 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "1fr line 2fr line"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is 'none'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is 'none'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,65 +8,65 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: 7px 11px;
- -webkit-grid-definition-rows: 17px 2px;
</del><ins>+ -webkit-grid-template-columns: 7px 11px;
+ -webkit-grid-template-rows: 17px 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53% 99%;
- -webkit-grid-definition-rows: 27% 52%;
</del><ins>+ -webkit-grid-template-columns: 53% 99%;
+ -webkit-grid-template-rows: 27% 52%;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: auto auto;
- -webkit-grid-definition-rows: auto auto;
</del><ins>+ -webkit-grid-template-columns: auto auto;
+ -webkit-grid-template-rows: auto auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithEM {
</span><del>- -webkit-grid-definition-columns: 10em 12em;
- -webkit-grid-definition-rows: 15em 17em;
</del><ins>+ -webkit-grid-template-columns: 10em 12em;
+ -webkit-grid-template-rows: 15em 17em;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithNoneAndAuto {
</span><del>- -webkit-grid-definition-columns: none auto;
- -webkit-grid-definition-rows: none auto;
</del><ins>+ -webkit-grid-template-columns: none auto;
+ -webkit-grid-template-rows: none auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridNoneWithAndFixed {
</span><del>- -webkit-grid-definition-columns: none 15px;
- -webkit-grid-definition-rows: none 22px;
</del><ins>+ -webkit-grid-template-columns: none 15px;
+ -webkit-grid-template-rows: none 22px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithThreeItems {
</span><del>- -webkit-grid-definition-columns: 15px auto 10em;
- -webkit-grid-definition-rows: 12em 18px auto;
</del><ins>+ -webkit-grid-template-columns: 15px auto 10em;
+ -webkit-grid-template-rows: 12em 18px auto;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithPercentAndViewportPercent {
</span><del>- -webkit-grid-definition-columns: 50% 15vw;
- -webkit-grid-definition-rows: 35% 28vh;
</del><ins>+ -webkit-grid-template-columns: 50% 15vw;
+ -webkit-grid-template-rows: 35% 28vh;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitContentAndFitAvailable {
</span><del>- -webkit-grid-definition-columns: -webkit-content-available;
- -webkit-grid-definition-rows: -webkit-fit-content -webkit-fit-available;
</del><ins>+ -webkit-grid-template-columns: -webkit-content-available;
+ -webkit-grid-template-rows: -webkit-fit-content -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxContent {
</span><del>- -webkit-grid-definition-columns: -webkit-min-content -webkit-max-content;
- -webkit-grid-definition-rows: -webkit-max-content -webkit-min-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-min-content -webkit-max-content;
+ -webkit-grid-template-rows: -webkit-max-content -webkit-min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndFixed {
</span><del>- -webkit-grid-definition-columns: minmax(45px, 30%) 15px;
- -webkit-grid-definition-rows: 12em minmax(35%, 10px);
</del><ins>+ -webkit-grid-template-columns: minmax(45px, 30%) 15px;
+ -webkit-grid-template-rows: 12em minmax(35%, 10px);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndMinMaxContent {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 30%) 15px;
- -webkit-grid-definition-rows: 12em minmax(35%, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
+ -webkit-grid-template-rows: 12em minmax(35%, -webkit-max-content);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionFraction {
</span><del>- -webkit-grid-definition-columns: 1fr 2fr;
- -webkit-grid-definition-rows: 3fr 4fr;
</del><ins>+ -webkit-grid-template-columns: 1fr 2fr;
+ -webkit-grid-template-rows: 3fr 4fr;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFractionMinMax {
</span><del>- -webkit-grid-definition-columns: minmax(-webkit-min-content, 45px) 2fr;
- -webkit-grid-definition-rows: 3fr minmax(14px, -webkit-max-content);
</del><ins>+ -webkit-grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
+ -webkit-grid-template-rows: 3fr minmax(14px, -webkit-max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,53 +8,53 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridWithNone {
</span><del>- -webkit-grid-definition-columns: none;
- -webkit-grid-definition-rows: none;
</del><ins>+ -webkit-grid-template-columns: none;
+ -webkit-grid-template-rows: none;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: 10px;
- -webkit-grid-definition-rows: 15px;
</del><ins>+ -webkit-grid-template-columns: 10px;
+ -webkit-grid-template-rows: 15px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53%;
- -webkit-grid-definition-rows: 27%;
</del><ins>+ -webkit-grid-template-columns: 53%;
+ -webkit-grid-template-rows: 27%;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: auto;
- -webkit-grid-definition-rows: auto;
</del><ins>+ -webkit-grid-template-columns: auto;
+ -webkit-grid-template-rows: auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithEM {
</span><del>- -webkit-grid-definition-columns: 10em;
- -webkit-grid-definition-rows: 15em;
</del><ins>+ -webkit-grid-template-columns: 10em;
+ -webkit-grid-template-rows: 15em;
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithViewPortPercentage {
</span><del>- -webkit-grid-definition-columns: 8vw;
- -webkit-grid-definition-rows: 10vh;
</del><ins>+ -webkit-grid-template-columns: 8vw;
+ -webkit-grid-template-rows: 10vh;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitContent {
</span><del>- -webkit-grid-definition-columns: -webkit-fit-content;
- -webkit-grid-definition-rows: -webkit-fit-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-fit-content;
+ -webkit-grid-template-rows: -webkit-fit-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitAvailable {
</span><del>- -webkit-grid-definition-columns: -webkit-fit-available;
- -webkit-grid-definition-rows: -webkit-fit-available;
</del><ins>+ -webkit-grid-template-columns: -webkit-fit-available;
+ -webkit-grid-template-rows: -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMax {
</span><del>- -webkit-grid-definition-columns: minmax(10%, 15px);
- -webkit-grid-definition-rows: minmax(20px, 50%);
</del><ins>+ -webkit-grid-template-columns: minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinContent {
</span><del>- -webkit-grid-definition-columns: -webkit-min-content;
- -webkit-grid-definition-rows: -webkit-min-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-min-content;
+ -webkit-grid-template-rows: -webkit-min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMaxContent {
</span><del>- -webkit-grid-definition-columns: -webkit-max-content;
- -webkit-grid-definition-rows: -webkit-max-content;
</del><ins>+ -webkit-grid-template-columns: -webkit-max-content;
+ -webkit-grid-template-rows: -webkit-max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFraction {
</span><del>- -webkit-grid-definition-columns: 1fr;
- -webkit-grid-definition-rows: 2fr;
</del><ins>+ -webkit-grid-template-columns: 1fr;
+ -webkit-grid-template-rows: 2fr;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,36 +1,36 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "15%"
-PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "18px"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
-PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "auto auto"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
-PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "auto middle 250px end auto middle 250px end"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px start auto end 10px start auto end"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "before auto before auto"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "before 10px before 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "250px end"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px end"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "start 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "start 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "start 140px 250px 250px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "auto 10px 10px"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-definition-columns') is "250px 250px 15% last"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-definition-rows') is "10px 10px end auto"
</del><ins>+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "15%"
+PASS window.getComputedStyle(singleSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "18px"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "minmax(15px, 50%) minmax(15px, 50%)"
+PASS window.getComputedStyle(twoSingleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "auto auto"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "auto minmax(100px, 120px) auto minmax(100px, 120px)"
+PASS window.getComputedStyle(twoDoubleTrackRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(5px, 10px) auto minmax(5px, 10px) auto"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "auto middle 250px end auto middle 250px end"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px start auto end 10px start auto end"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "before auto before auto"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "before 10px before 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px end"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px end"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "start 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "start 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "start 140px 250px 250px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "auto 10px 10px"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-columns') is "250px 250px 15% last"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 10px end auto"
</ins><span class="cx">
</span><span class="cx"> Test invalid repeat syntax.
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -8,48 +8,48 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .singleSingleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(1, 18px);
- -webkit-grid-definition-columns: repeat(1, 15%);
</del><ins>+ -webkit-grid-template-rows: repeat(1, 18px);
+ -webkit-grid-template-columns: repeat(1, 15%);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoSingleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, auto);
- -webkit-grid-definition-columns: repeat(2, minmax(15px, 50%));
</del><ins>+ -webkit-grid-template-rows: repeat(2, auto);
+ -webkit-grid-template-columns: repeat(2, minmax(15px, 50%));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, minmax(5px, 10px) auto);
- -webkit-grid-definition-columns: repeat(2, auto minmax(100px, 120px));
</del><ins>+ -webkit-grid-template-rows: repeat(2, minmax(5px, 10px) auto);
+ -webkit-grid-template-columns: repeat(2, auto minmax(100px, 120px));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackWithNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 10px 'start' auto 'end');
- -webkit-grid-definition-columns: repeat(2, auto 'middle' 250px 'end');
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px 'start' auto 'end');
+ -webkit-grid-template-columns: repeat(2, auto 'middle' 250px 'end');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .twoDoubleTrackWithTrailingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 'before' 10px);
- -webkit-grid-definition-columns: repeat(2, 'before' auto);
</del><ins>+ -webkit-grid-template-rows: repeat(2, 'before' 10px);
+ -webkit-grid-template-columns: repeat(2, 'before' auto);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .trailingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(1, 10px) 'end';
- -webkit-grid-definition-columns: repeat(1, 250px) 'end';
</del><ins>+ -webkit-grid-template-rows: repeat(1, 10px) 'end';
+ -webkit-grid-template-columns: repeat(1, 250px) 'end';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .leadingNamedGridLineRepeat {
</span><del>- -webkit-grid-definition-rows: 'start' repeat(2, 10px);
- -webkit-grid-definition-columns: 'start' repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: 'start' repeat(2, 10px);
+ -webkit-grid-template-columns: 'start' repeat(2, 250px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mixRepeatAfterNonRepeat {
</span><del>- -webkit-grid-definition-rows: auto repeat(2, 10px);
- -webkit-grid-definition-columns: 'start' 140px repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: auto repeat(2, 10px);
+ -webkit-grid-template-columns: 'start' 140px repeat(2, 250px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mixNonRepeatAfterRepeat {
</span><del>- -webkit-grid-definition-rows: repeat(2, 10px) 'end' auto;
- -webkit-grid-definition-columns: repeat(2, 250px) 15% 'last';
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px) 'end' auto;
+ -webkit-grid-template-columns: repeat(2, 250px) 15% 'last';
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="lines">@@ -67,18 +67,18 @@
</span><span class="cx">
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><del>- description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
</del><ins>+ description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected');
</ins><span class="cx">
</span><del>- debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
- testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeat"), "15%", "18px");
- testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "minmax(15px, 50%) minmax(15px, 50%)", "auto auto");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackRepeat"), "auto minmax(100px, 120px) auto minmax(100px, 120px)", "minmax(5px, 10px) auto minmax(5px, 10px) auto");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithNamedGridLineRepeat"), "auto middle 250px end auto middle 250px end", "10px start auto end 10px start auto end");
- testGridDefinitionsValues(document.getElementById("twoDoubleTrackWithTrailingNamedGridLineRepeat"), "before auto before auto", "before 10px before 10px");
- testGridDefinitionsValues(document.getElementById("trailingNamedGridLineRepeat"), "250px end", "10px end");
- testGridDefinitionsValues(document.getElementById("leadingNamedGridLineRepeat"), "start 250px 250px", "start 10px 10px");
- testGridDefinitionsValues(document.getElementById("mixRepeatAfterNonRepeat"), "start 140px 250px 250px", "auto 10px 10px");
- testGridDefinitionsValues(document.getElementById("mixNonRepeatAfterRepeat"), "250px 250px 15% last", "10px 10px end auto");
</del><ins>+ debug("Test getting grid-template-columns and grid-template-rows set through CSS");
+ testGridTemplatesValues(document.getElementById("singleSingleTrackRepeat"), "15%", "18px");
+ testGridTemplatesValues(document.getElementById("twoSingleTrackRepeat"), "minmax(15px, 50%) minmax(15px, 50%)", "auto auto");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackRepeat"), "auto minmax(100px, 120px) auto minmax(100px, 120px)", "minmax(5px, 10px) auto minmax(5px, 10px) auto");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackWithNamedGridLineRepeat"), "auto middle 250px end auto middle 250px end", "10px start auto end 10px start auto end");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrackWithTrailingNamedGridLineRepeat"), "before auto before auto", "before 10px before 10px");
+ testGridTemplatesValues(document.getElementById("trailingNamedGridLineRepeat"), "250px end", "10px end");
+ testGridTemplatesValues(document.getElementById("leadingNamedGridLineRepeat"), "start 250px 250px", "start 10px 10px");
+ testGridTemplatesValues(document.getElementById("mixRepeatAfterNonRepeat"), "start 140px 250px 250px", "auto 10px 10px");
+ testGridTemplatesValues(document.getElementById("mixNonRepeatAfterRepeat"), "250px 250px 15% last", "10px 10px end auto");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test invalid repeat syntax.");
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx"> element.style.gridDefinitionColumns = gridColumn;
</span><del>- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "none");
</del><ins>+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
</ins><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> testInvalidSyntax("repeat(");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,77 +1,77 @@
</span><del>-Test that setting and getting grid-definition-columns and grid-definition-rows works as expected
</del><ins>+Test that setting and getting grid-template-columns and grid-template-rows works as expected
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Test getting grid-definition-columns and grid-definition-rows set through CSS
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is "first 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is "first 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is "53% last"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is "27% last"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is "first auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is "auto last"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is "first minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(20px, 50%) last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 10px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-definition-rows') is "nav first 15px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first 10% nav 15% last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-definition-rows') is "first nav2 25% nav2 75% last"
</del><ins>+Test getting grid-template-columns and grid-template-rows set through CSS
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-columns') is "first 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-template-rows') is "first 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-columns') is "53% last"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-template-rows') is "27% last"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-columns') is "first auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-template-rows') is "auto last"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-columns') is "first minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(20px, 50%) last"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 10px last"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue('-webkit-grid-template-rows') is "nav first 15px last"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-columns') is "nav first 10% nav 15% last"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, '').getPropertyValue('-webkit-grid-template-rows') is "first nav2 25% nav2 75% last"
</ins><span class="cx">
</span><del>-Test getting and setting grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 18px"
-PASS element.style.webkitGridDefinitionColumns is "first 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "66px last"
-PASS element.style.webkitGridDefinitionRows is "66px last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first 55%"
-PASS element.style.webkitGridDefinitionColumns is "first 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "40% last"
-PASS element.style.webkitGridDefinitionRows is "40% last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first auto"
-PASS element.style.webkitGridDefinitionColumns is "first auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "auto last"
-PASS element.style.webkitGridDefinitionRows is "auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first -webkit-min-content"
-PASS element.style.webkitGridDefinitionColumns is "first -webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-min-content last"
-PASS element.style.webkitGridDefinitionRows is "-webkit-min-content last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first -webkit-max-content"
-PASS element.style.webkitGridDefinitionColumns is "first -webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "-webkit-max-content last"
-PASS element.style.webkitGridDefinitionRows is "-webkit-max-content last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first minmax(55%, 45px)"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(55%, 45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(30px, 40%) last"
-PASS element.style.webkitGridDefinitionRows is "minmax(30px, 40%) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first minmax(220px, -webkit-max-content)"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(-webkit-max-content, 50px) last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first minmax(220px, -webkit-min-content)"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(22em, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(-webkit-min-content, 50px) last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-min-content, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "first minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.webkitGridDefinitionColumns is "first minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "minmax(-webkit-max-content, -webkit-min-content) last"
-PASS element.style.webkitGridDefinitionRows is "minmax(-webkit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first minmax(-webkit-min-content, -webkit-max-content) last"
-PASS element.style.webkitGridDefinitionColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "nav first minmax(-webkit-max-content, -webkit-min-content) last"
-PASS element.style.webkitGridDefinitionRows is "first nav minmax(-webkit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "nav first minmax(-webkit-min-content, -webkit-max-content) nav auto last"
-PASS element.style.webkitGridDefinitionColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
-PASS element.style.webkitGridDefinitionRows is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "foo bar auto foo auto bar"
-PASS element.style.webkitGridDefinitionColumns is "foo bar auto foo auto bar"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "foo bar auto foo auto bar"
-PASS element.style.webkitGridDefinitionRows is "foo bar auto foo auto bar"
</del><ins>+Test getting and setting grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 18px"
+PASS element.style.webkitGridTemplateColumns is "first 18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "66px last"
+PASS element.style.webkitGridTemplateRows is "66px last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first 55%"
+PASS element.style.webkitGridTemplateColumns is "first 55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "40% last"
+PASS element.style.webkitGridTemplateRows is "40% last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first auto"
+PASS element.style.webkitGridTemplateColumns is "first auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "auto last"
+PASS element.style.webkitGridTemplateRows is "auto last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first -webkit-min-content"
+PASS element.style.webkitGridTemplateColumns is "first -webkit-min-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-min-content last"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first -webkit-max-content"
+PASS element.style.webkitGridTemplateColumns is "first -webkit-max-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "-webkit-max-content last"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first minmax(55%, 45px)"
+PASS element.style.webkitGridTemplateColumns is "first minmax(55%, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(30px, 40%) last"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first minmax(220px, -webkit-max-content)"
+PASS element.style.webkitGridTemplateColumns is "first minmax(22em, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, 50px) last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, 5em) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first minmax(220px, -webkit-min-content)"
+PASS element.style.webkitGridTemplateColumns is "first minmax(22em, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-min-content, 50px) last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-content, 5em) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "first minmax(-webkit-min-content, -webkit-max-content)"
+PASS element.style.webkitGridTemplateColumns is "first minmax(-webkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content) last"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "nav first minmax(-webkit-min-content, -webkit-max-content) last"
+PASS element.style.webkitGridTemplateColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "nav first minmax(-webkit-max-content, -webkit-min-content) last"
+PASS element.style.webkitGridTemplateRows is "first nav minmax(-webkit-max-content, -webkit-min-content) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "nav first minmax(-webkit-min-content, -webkit-max-content) nav auto last"
+PASS element.style.webkitGridTemplateColumns is "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
+PASS element.style.webkitGridTemplateRows is "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "foo bar auto foo auto bar"
+PASS element.style.webkitGridTemplateColumns is "foo bar auto foo auto bar"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "foo bar auto foo auto bar"
+PASS element.style.webkitGridTemplateRows is "foo bar auto foo auto bar"
</ins><span class="cx">
</span><del>-Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
</del><ins>+Test getting and setting invalid grid-template-columns and grid-template-rows through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns') is "none"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows') is "none"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -14,28 +14,28 @@
</span><span class="cx"> width: 77px;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFixed {
</span><del>- -webkit-grid-definition-columns: "first" 10px;
- -webkit-grid-definition-rows: "first" 15px;
</del><ins>+ -webkit-grid-template-columns: "first" 10px;
+ -webkit-grid-template-rows: "first" 15px;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercent {
</span><del>- -webkit-grid-definition-columns: 53% "last";
- -webkit-grid-definition-rows: 27% "last";
</del><ins>+ -webkit-grid-template-columns: 53% "last";
+ -webkit-grid-template-rows: 27% "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- -webkit-grid-definition-columns: "first" auto;
- -webkit-grid-definition-rows: auto "last";
</del><ins>+ -webkit-grid-template-columns: "first" auto;
+ -webkit-grid-template-rows: auto "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMax {
</span><del>- -webkit-grid-definition-columns: "first" minmax(10%, 15px);
- -webkit-grid-definition-rows: minmax(20px, 50%) "last";
</del><ins>+ -webkit-grid-template-columns: "first" minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%) "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFixedMultiple {
</span><del>- -webkit-grid-definition-columns: "first" "nav" 10px "last";
- -webkit-grid-definition-rows: "first" "nav" 15px "last";
</del><ins>+ -webkit-grid-template-columns: "first" "nav" 10px "last";
+ -webkit-grid-template-rows: "first" "nav" 15px "last";
</ins><span class="cx"> }
</span><span class="cx"> .gridWithPercentageSameStringMultipleTimes {
</span><del>- -webkit-grid-definition-columns: "first" "nav" 10% "nav" 15% "last";
- -webkit-grid-definition-rows: "first" "nav2" 25% "nav2" 75% "last";
</del><ins>+ -webkit-grid-template-columns: "first" "nav" 10% "nav" 15% "last";
+ -webkit-grid-template-rows: "first" "nav2" 25% "nav2" 75% "last";
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="lines">@@ -53,46 +53,46 @@
</span><span class="cx">
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><del>- description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+ description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>- debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
- testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "first 10px", "first 15px");
- testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% last", "27% last");
- testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "first auto", "auto last");
- testGridDefinitionsValues(document.getElementById("gridWithMinMax"), "first minmax(10%, 15px)", "minmax(20px, 50%) last");
- testGridDefinitionsValues(document.getElementById("gridWithFixedMultiple"), "nav first 10px last", "nav first 15px last");
- testGridDefinitionsValues(document.getElementById("gridWithPercentageSameStringMultipleTimes"), "nav first 10% nav 15% last", "first nav2 25% nav2 75% last");
</del><ins>+ debug("Test getting grid-template-columns and grid-template-rows set through CSS");
+ testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "first 10px", "first 15px");
+ testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "53% last", "27% last");
+ testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "first auto", "auto last");
+ testGridTemplatesValues(document.getElementById("gridWithMinMax"), "first minmax(10%, 15px)", "minmax(20px, 50%) last");
+ testGridTemplatesValues(document.getElementById("gridWithFixedMultiple"), "nav first 10px last", "nav first 15px last");
+ testGridTemplatesValues(document.getElementById("gridWithPercentageSameStringMultipleTimes"), "nav first 10% nav 15% last", "first nav2 25% nav2 75% last");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>- debug("Test getting and setting grid-definition-columns and grid-definition-rows through JS");
- testNonGridDefinitionsSetJSValues("'first' 18px", "66px 'last'", "first 18px", "66px last", "first 18px", "66px last");
- testNonGridDefinitionsSetJSValues("'first' 55%", "40% 'last'", "first 55%", "40% last", "first 55%", "40% last");
- testNonGridDefinitionsSetJSValues("'first' auto", "auto 'last'", "first auto", "auto last", "first auto", "auto last");
- testNonGridDefinitionsSetJSValues("'first' -webkit-min-content", "-webkit-min-content 'last'", "first -webkit-min-content", "-webkit-min-content last", "first -webkit-min-content", "-webkit-min-content last");
- testNonGridDefinitionsSetJSValues("'first' -webkit-max-content", "-webkit-max-content 'last'", "first -webkit-max-content", "-webkit-max-content last", "first -webkit-max-content", "-webkit-max-content last");
- testNonGridDefinitionsSetJSValues("'first' minmax(55%, 45px)", "minmax(30px, 40%) 'last'", "first minmax(55%, 45px)", "minmax(30px, 40%) last", "first minmax(55%, 45px)", "minmax(30px, 40%) last");
- testNonGridDefinitionsSetJSValues("'first' minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) 'last'", "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last", "first minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) last", "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last", "minmax(-webkit-max-content, 50px) last");
- testNonGridDefinitionsSetJSValues("'first' minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) 'last'", "first minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) last", "first minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) last", "first minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) last", "minmax(-webkit-min-content, 50px) last");
- testNonGridDefinitionsSetJSValues("'first' minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) 'last'", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last");
- testNonGridDefinitionsSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'", "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'", "nav first minmax(-webkit-min-content, -webkit-max-content) last", "nav first minmax(-webkit-max-content, -webkit-min-content) last", "first nav minmax(-webkit-min-content, -webkit-max-content) last", "first nav minmax(-webkit-max-content, -webkit-min-content) last");
- testNonGridDefinitionsSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'", "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'", "nav first minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last", "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last");;
- testNonGridDefinitionsSetJSValues("'foo' 'bar' auto 'foo' auto 'bar'", "'foo' 'bar' auto 'foo' auto 'bar'", "foo bar auto foo auto bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar");
</del><ins>+ debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
+ testNonGridTemplatesSetJSValues("'first' 18px", "66px 'last'", "first 18px", "66px last", "first 18px", "66px last");
+ testNonGridTemplatesSetJSValues("'first' 55%", "40% 'last'", "first 55%", "40% last", "first 55%", "40% last");
+ testNonGridTemplatesSetJSValues("'first' auto", "auto 'last'", "first auto", "auto last", "first auto", "auto last");
+ testNonGridTemplatesSetJSValues("'first' -webkit-min-content", "-webkit-min-content 'last'", "first -webkit-min-content", "-webkit-min-content last", "first -webkit-min-content", "-webkit-min-content last");
+ testNonGridTemplatesSetJSValues("'first' -webkit-max-content", "-webkit-max-content 'last'", "first -webkit-max-content", "-webkit-max-content last", "first -webkit-max-content", "-webkit-max-content last");
+ testNonGridTemplatesSetJSValues("'first' minmax(55%, 45px)", "minmax(30px, 40%) 'last'", "first minmax(55%, 45px)", "minmax(30px, 40%) last", "first minmax(55%, 45px)", "minmax(30px, 40%) last");
+ testNonGridTemplatesSetJSValues("'first' minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) 'last'", "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last", "first minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) last", "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last", "minmax(-webkit-max-content, 50px) last");
+ testNonGridTemplatesSetJSValues("'first' minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) 'last'", "first minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) last", "first minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) last", "first minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) last", "minmax(-webkit-min-content, 50px) last");
+ testNonGridTemplatesSetJSValues("'first' minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) 'last'", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last", "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last");
+ testNonGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'", "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'", "nav first minmax(-webkit-min-content, -webkit-max-content) last", "nav first minmax(-webkit-max-content, -webkit-min-content) last", "first nav minmax(-webkit-min-content, -webkit-max-content) last", "first nav minmax(-webkit-max-content, -webkit-min-content) last");
+ testNonGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'", "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'", "nav first minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last", "first nav minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last");;
+ testNonGridTemplatesSetJSValues("'foo' 'bar' auto 'foo' auto 'bar'", "'foo' 'bar' auto 'foo' auto 'bar'", "foo bar auto foo auto bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar", "foo bar auto foo auto bar");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>- debug("Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS");
</del><ins>+ debug("Test getting and setting invalid grid-template-columns and grid-template-rows through JS");
</ins><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "'foo'";
- element.style.webkitGridDefinitionRows = "'bar";
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "none");
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "none");
</del><ins>+ element.style.webkitGridTemplateColumns = "'foo'";
+ element.style.webkitGridTemplateRows = "'bar";
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "none");
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "'foo' 'bar'";
- element.style.webkitGridDefinitionRows = "'bar' 'foo'";
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "none");
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "none");
</del><ins>+ element.style.webkitGridTemplateColumns = "'foo' 'bar'";
+ element.style.webkitGridTemplateRows = "'bar' 'foo'";
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "none");
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "none");
</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="trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackinpercentgridhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- -webkit-grid-definition-columns: 40% 60%;
- -webkit-grid-definition-rows: 30% 70%;
</del><ins>+ -webkit-grid-template-columns: 40% 60%;
+ -webkit-grid-template-rows: 30% 70%;
</ins><span class="cx"> width: 80%;
</span><span class="cx"> height: 50%;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 70% 30%;
- -webkit-grid-definition-rows: 40% 60%;
</del><ins>+ -webkit-grid-template-columns: 70% 30%;
+ -webkit-grid-template-rows: 40% 60%;
</ins><span class="cx"> width: 400px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span><span class="lines">@@ -35,22 +35,22 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <script>
</span><del>-function changeGridDefinitionsAndCheckValues()
</del><ins>+function changeGridTemplatesAndCheckValues()
</ins><span class="cx"> {
</span><span class="cx"> var grid0 = document.getElementsByClassName("grid")[0];
</span><span class="cx"> var grid1 = document.getElementsByClassName("grid")[1];
</span><span class="cx"> var grid2 = document.getElementsByClassName("grid")[2];
</span><span class="cx"> document.body.offsetLeft;
</span><del>- grid0.style.webkitGridDefinitionColumns = "40% 60%";
</del><ins>+ grid0.style.webkitGridTemplateColumns = "40% 60%";
</ins><span class="cx">
</span><del>- grid1.style.webkitGridDefinitionRows = "30% 70%";
</del><ins>+ grid1.style.webkitGridTemplateRows = "30% 70%";
</ins><span class="cx">
</span><del>- grid2.style.webkitGridDefinitionColumns = "40% 60%";
- grid2.style.webkitGridDefinitionRows = "30% 70%";
</del><ins>+ grid2.style.webkitGridTemplateColumns = "40% 60%";
+ grid2.style.webkitGridTemplateRows = "30% 70%";
</ins><span class="cx">
</span><span class="cx"> checkLayout('.grid');
</span><span class="cx"> }
</span><del>-window.addEventListener("load", changeGridDefinitionsAndCheckValues, false);
</del><ins>+window.addEventListener("load", changeGridTemplatesAndCheckValues, false);
</ins><span class="cx"> </script>
</span><span class="cx"> <body>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentgriditeminpercentgridtrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 40% 60%;
- -webkit-grid-definition-rows: 30% 70%;
</del><ins>+ -webkit-grid-template-columns: 40% 60%;
+ -webkit-grid-template-rows: 30% 70%;
</ins><span class="cx"> width: 400px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentpaddingmarginresolutiongriditemupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 200px 200px;
- -webkit-grid-definition-rows: 100px 100px;
</del><ins>+ -webkit-grid-template-columns: 200px 200px;
+ -webkit-grid-template-rows: 100px 100px;
</ins><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> {
</span><span class="cx"> var grid = document.getElementsByClassName("grid")[0];
</span><span class="cx"> grid.offsetLeft;
</span><del>- grid.style.webkitGridDefinitionColumns = "100px 300px";
- grid.style.webkitGridDefinitionRows = "50px 150px";
</del><ins>+ grid.style.webkitGridTemplateColumns = "100px 300px";
+ grid.style.webkitGridTemplateRows = "50px 150px";
</ins><span class="cx"> checkLayout('.grid');
</span><span class="cx"> }
</span><span class="cx"> window.addEventListener("load", changeGridTrackSizesAndCheckLayout, false);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentpaddingmarginresolutiongriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 100px 300px;
- -webkit-grid-definition-rows: 50px 150px;
</del><ins>+ -webkit-grid-template-columns: 100px 300px;
+ -webkit-grid-template-rows: 50px 150px;
</ins><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 100px 300px;
- -webkit-grid-definition-rows: 50px 150px;
</del><ins>+ -webkit-grid-template-columns: 100px 300px;
+ -webkit-grid-template-rows: 50px 150px;
</ins><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutplacecellbyindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -7,8 +7,8 @@
</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-definition-columns: 50px 60px;
- -webkit-grid-definition-rows: 20px 30px;
</del><ins>+ -webkit-grid-template-columns: 50px 60px;
+ -webkit-grid-template-rows: 20px 30px;
</ins><span class="cx"> max-width: 110px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,54 +1,54 @@
</span><del>-description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>-debug("Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS");
-testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "7px 11px", "17px 2px");
-testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%", "424px 792px", "162px 312px");
-testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto", "0px 17px", "0px 3px");
-testGridDefinitionsValues(document.getElementById("gridWithEMElement"), "100px 120px", "150px 170px");
-testGridDefinitionsValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto", "15px 0px 100px", "120px 18px 0px");
-testGridDefinitionsValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px", "400px 120px", "210px 168px");
-testGridDefinitionsValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "0px 0px", "0px 0px");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxContentWithChildrenElement"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "7px 17px", "11px 3px");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)", "240px 15px", "120px 210px");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)", "240px 15px", "120px 210px");
-testGridDefinitionsValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr", "320px 480px", "225px 375px");
-testGridDefinitionsValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)", "45px 755px", "586px 14px");
</del><ins>+debug("Test getting |grid-template-columns| and |grid-template-rows| set through CSS");
+testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "7px 11px", "17px 2px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%", "424px 792px", "162px 312px");
+testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto", "0px 17px", "0px 3px");
+testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px 120px", "150px 170px");
+testGridTemplatesValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto", "15px 0px 100px", "120px 18px 0px");
+testGridTemplatesValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px", "400px 120px", "210px 168px");
+testGridTemplatesValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "0px 0px", "0px 0px");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxContentWithChildrenElement"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "7px 17px", "11px 3px");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)", "240px 15px", "120px 210px");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)", "240px 15px", "120px 210px");
+testGridTemplatesValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr", "320px 480px", "225px 375px");
+testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)", "45px 755px", "586px 14px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting grid-definition-rows and grid-definition-columns through JS");
-testGridDefinitionsSetJSValues("18px 22px", "66px 70px");
-testGridDefinitionsSetJSValues("55% 80%", "40% 63%", "440px 640px", "240px 378px");
-testGridDefinitionsSetJSValues("auto auto", "auto auto", "0px 0px", "0px 0px");
-testGridDefinitionsSetJSValues("auto 16em 22px", "56% 10em auto", "0px 160px 22px", "336px 100px 0px");
-testGridDefinitionsSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px 20px", "90px 0px");
-testGridDefinitionsSetJSValues("16em 2fr", "14fr auto", "160px 640px", "600px 0px");
</del><ins>+debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
+testGridTemplatesSetJSValues("18px 22px", "66px 70px");
+testGridTemplatesSetJSValues("55% 80%", "40% 63%", "440px 640px", "240px 378px");
+testGridTemplatesSetJSValues("auto auto", "auto auto", "0px 0px", "0px 0px");
+testGridTemplatesSetJSValues("auto 16em 22px", "56% 10em auto", "0px 160px 22px", "336px 100px 0px");
+testGridTemplatesSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px 20px", "90px 0px");
+testGridTemplatesSetJSValues("16em 2fr", "14fr auto", "160px 640px", "600px 0px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values set from CSS");
</span><del>-testGridDefinitionsValues(document.getElementById("gridWithNoneAndAuto"), "none", "none");
-testGridDefinitionsValues(document.getElementById("gridWithNoneAndFixed"), "none", "none");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithNoneAndAuto"), "none", "none");
+testGridTemplatesValues(document.getElementById("gridWithNoneAndFixed"), "none", "none");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting and getting wrong values from JS");
</span><del>-testGridDefinitionsSetBadJSValues("none auto", "none auto");
-testGridDefinitionsSetBadJSValues("none 16em", "none 56%");
-testGridDefinitionsSetBadJSValues("none none", "none none");
-testGridDefinitionsSetBadJSValues("auto none", "auto none");
-testGridDefinitionsSetBadJSValues("auto none 16em", "auto 18em none");
-testGridDefinitionsSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
-testGridDefinitionsSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</del><ins>+testGridTemplatesSetBadJSValues("none auto", "none auto");
+testGridTemplatesSetBadJSValues("none 16em", "none 56%");
+testGridTemplatesSetBadJSValues("none none", "none none");
+testGridTemplatesSetBadJSValues("auto none", "auto none");
+testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
+testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
+testGridTemplatesSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</ins><span class="cx">
</span><span class="cx"> // Negative values are not allowed.
</span><del>-testGridDefinitionsSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
-testGridDefinitionsSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</del><ins>+testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
+testGridTemplatesSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</ins><span class="cx">
</span><span class="cx"> function testInherit()
</span><span class="cx"> {
</span><span class="lines">@@ -56,20 +56,20 @@
</span><span class="cx"> document.body.appendChild(parentElement);
</span><span class="cx"> parentElement.style.width = "800px";
</span><span class="cx"> parentElement.style.font = "10px Ahem"; // Used to resolve em font consistently.
</span><del>- parentElement.style.webkitGridDefinitionColumns = "50px 1fr 'last'";
- parentElement.style.webkitGridDefinitionRows = "2em 'middle' 45px";
</del><ins>+ parentElement.style.webkitGridTemplateColumns = "50px 1fr 'last'";
+ parentElement.style.webkitGridTemplateRows = "2em 'middle' 45px";
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> parentElement.appendChild(element);
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>- element.style.webkitGridDefinitionColumns = "inherit";
- element.style.webkitGridDefinitionRows = "inherit";
- testGridDefinitionsValues(element, "50px 750px last", "20px middle 45px");
</del><ins>+ element.style.webkitGridTemplateColumns = "inherit";
+ element.style.webkitGridTemplateRows = "inherit";
+ testGridTemplatesValues(element, "50px 750px last", "20px middle 45px");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(parentElement);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
</ins><span class="cx"> testInherit();
</span><span class="cx">
</span><span class="cx"> function testInitial()
</span><span class="lines">@@ -79,16 +79,16 @@
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><span class="cx"> element.style.width = "800px";
</span><span class="cx"> element.style.height = "600px";
</span><del>- element.style.webkitGridDefinitionColumns = "150% 'middle' 55px";
- element.style.webkitGridDefinitionRows = "1fr 'line' 2fr 'line'";
- testGridDefinitionsValues(element, "1200px middle 55px", "200px line 400px line");
</del><ins>+ element.style.webkitGridTemplateColumns = "150% 'middle' 55px";
+ element.style.webkitGridTemplateRows = "1fr 'line' 2fr 'line'";
+ testGridTemplatesValues(element, "1200px middle 55px", "200px line 400px line");
</ins><span class="cx">
</span><del>- element.style.webkitGridDefinitionColumns = "initial";
- element.style.webkitGridDefinitionRows = "initial";
- testGridDefinitionsValues(element, "none", "none");
</del><ins>+ element.style.webkitGridTemplateColumns = "initial";
+ element.style.webkitGridTemplateRows = "initial";
+ testGridTemplatesValues(element, "none", "none");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
</ins><span class="cx"> testInitial();
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,106 +1,107 @@
</span><del>-description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>-debug("Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS");
-testGridDefinitionsValues(document.getElementById("gridWithNoneElement"), "none", "none");
-testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
-testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "424px", "162px");
-testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "0px", "0px");
-testGridDefinitionsValues(document.getElementById("gridWithAutoWithChildrenElement"), "7px", "11px");
-testGridDefinitionsValues(document.getElementById("gridWithEMElement"), "100px", "150px");
-testGridDefinitionsValues(document.getElementById("gridWithViewPortPercentageElement"), "64px", "60px");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxElement"), "80px", "300px");
-testGridDefinitionsValues(document.getElementById("gridWithMinContentElement"), "0px", "0px");
-testGridDefinitionsValues(document.getElementById("gridWithMinContentWithChildrenElement"), "17px", "11px");
-testGridDefinitionsValues(document.getElementById("gridWithMaxContentElement"), "0px", "0px");
-testGridDefinitionsValues(document.getElementById("gridWithMaxContentWithChildrenElement"), "17px", "11px");
-testGridDefinitionsValues(document.getElementById("gridWithFractionElement"), "800px", "600px");
</del><ins>+debug("Test getting -webkit-grid-template-columns and -webkit-grid-template-rows set through CSS");
+testGridTemplatesValues(document.getElementById("gridWithNoneElement"), "none", "none");
+testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "424px", "162px");
+testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "0px", "0px");
+testGridTemplatesValues(document.getElementById("gridWithAutoWithChildrenElement"), "7px", "11px");
+testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px", "150px");
+testGridTemplatesValues(document.getElementById("gridWithViewPortPercentageElement"), "64px", "60px");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxElement"), "80px", "300px");
+testGridTemplatesValues(document.getElementById("gridWithMinContentElement"), "0px", "0px");
+testGridTemplatesValues(document.getElementById("gridWithMinContentWithChildrenElement"), "17px", "11px");
+testGridTemplatesValues(document.getElementById("gridWithMaxContentElement"), "0px", "0px");
+testGridTemplatesValues(document.getElementById("gridWithMaxContentWithChildrenElement"), "17px", "11px");
+testGridTemplatesValues(document.getElementById("gridWithFractionElement"), "800px", "600px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting wrong values for -webkit-grid-definition-columns and -webkit-grid-definition-rows through CSS (they should resolve to the default: 'none')");
</del><ins>+debug("Test getting wrong values for -webkit-grid-template-columns and -webkit-grid-template-rows through CSS (they should resolve to the default: 'none')");
</ins><span class="cx"> var gridWithFitContentElement = document.getElementById("gridWithFitContentElement");
</span><del>-testGridDefinitionsValues(gridWithFitContentElement, "none", "none");
</del><ins>+testGridTemplatesValues(gridWithFitContentElement, "none", "none");
</ins><span class="cx">
</span><span class="cx"> var gridWithFitAvailableElement = document.getElementById("gridWithFitAvailableElement");
</span><del>-testGridDefinitionsValues(gridWithFitAvailableElement, "none", "none");
</del><ins>+testGridTemplatesValues(gridWithFitAvailableElement, "none", "none");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-testGridDefinitionsValues(element, "none", "none");
</del><ins>+testGridTemplatesValues(element, "none", "none");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS");
-testGridDefinitionsSetJSValues("18px", "66px");
-testGridDefinitionsSetJSValues("55%", "40%", "440px", "240px");
-testGridDefinitionsSetJSValues("auto", "auto", "0px", "0px");
-testGridDefinitionsSetJSValues("10vw", "25vh", "80px", "150px");
-testGridDefinitionsSetJSValues("-webkit-min-content", "-webkit-min-content", "0px", "0px");
-testGridDefinitionsSetJSValues("-webkit-max-content", "-webkit-max-content", "0px", "0px");
</del><ins>+debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows through JS");
+testGridTemplatesSetJSValues("18px", "66px");
+testGridTemplatesSetJSValues("55%", "40%", "440px", "240px");
+testGridTemplatesSetJSValues("auto", "auto", "0px", "0px");
+testGridTemplatesSetJSValues("10vw", "25vh", "80px", "150px");
+testGridTemplatesSetJSValues("-webkit-min-content", "-webkit-min-content", "0px", "0px");
+testGridTemplatesSetJSValues("-webkit-max-content", "-webkit-max-content", "0px", "0px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows to minmax() values through JS");
-testGridDefinitionsSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)", "440px", "240px");
-testGridDefinitionsSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "220px", "80px");
-testGridDefinitionsSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "48px", "80px");
-testGridDefinitionsSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "220px", "50px");
-testGridDefinitionsSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)", "0px", "0px");
</del><ins>+debug("Test getting and setting -webkit-grid-template-columns and -webkit-grid-template-rows to minmax() values through JS");
+testGridTemplatesSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)", "440px", "240px");
+testGridTemplatesSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "220px", "80px");
+testGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "48px", "80px");
+testGridTemplatesSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "220px", "50px");
+testGridTemplatesSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)", "0px", "0px");
+
</ins><span class="cx"> // Unit comparison should be case-insensitive.
</span><del>-testGridDefinitionsSetJSValues("3600Fr", "154fR", "800px", "600px", "3600fr", "154fr");
</del><ins>+testGridTemplatesSetJSValues("3600Fr", "154fR", "800px", "600px", "3600fr", "154fr");
</ins><span class="cx">
</span><span class="cx"> // Float values are allowed.
</span><del>-+testGridDefinitionsSetJSValues("3.1459fr", "2.718fr", "800px", "600px");
</del><ins>++testGridTemplatesSetJSValues("3.1459fr", "2.718fr", "800px", "600px");
</ins><span class="cx">
</span><span class="cx"> // A leading '+' is allowed.
</span><del>-testGridDefinitionsSetJSValues("+3fr", "+4fr", "800px", "600px", "3fr", "4fr");
</del><ins>+testGridTemplatesSetJSValues("+3fr", "+4fr", "800px", "600px", "3fr", "4fr");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to bad values through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to bad values through JS");
</ins><span class="cx"> // No comma and only 1 argument provided.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
</del><ins>+testGridTemplatesSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
</ins><span class="cx"> // Nested minmax and only 2 arguments are allowed.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)");
</ins><span class="cx"> // No breadth value and no comma.
</span><del>-testGridDefinitionsSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</del><ins>+testGridTemplatesSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</ins><span class="cx">
</span><span class="cx"> // Auto is not allowed inside minmax.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
-testGridDefinitionsSetBadJSValues("-2fr", "3ffr");
-testGridDefinitionsSetBadJSValues("-2.05fr", "+-3fr");
-testGridDefinitionsSetBadJSValues("0fr", "1r");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
+testGridTemplatesSetBadJSValues("-2fr", "3ffr");
+testGridTemplatesSetBadJSValues("-2.05fr", "+-3fr");
+testGridTemplatesSetBadJSValues("0fr", "1r");
</ins><span class="cx"> // A dimension doesn't allow spaces between the number and the unit.
</span><del>-testGridDefinitionsSetBadJSValues(".0000fr", "13 fr");
-testGridDefinitionsSetBadJSValues("7.-fr", "-8,0fr");
</del><ins>+testGridTemplatesSetBadJSValues(".0000fr", "13 fr");
+testGridTemplatesSetBadJSValues("7.-fr", "-8,0fr");
</ins><span class="cx">
</span><span class="cx"> // Negative values are not allowed.
</span><del>-testGridDefinitionsSetBadJSValues("-1px", "-6em");
-testGridDefinitionsSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
</del><ins>+testGridTemplatesSetBadJSValues("-1px", "-6em");
+testGridTemplatesSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS");
-testGridDefinitionsSetJSValues("18px", "66px");
-testGridDefinitionsSetJSValues("none", "none");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
+testGridTemplatesSetJSValues("18px", "66px");
+testGridTemplatesSetJSValues("none", "none");
</ins><span class="cx">
</span><span class="cx"> function testInherit()
</span><span class="cx"> {
</span><span class="cx"> var parentElement = document.createElement("div");
</span><span class="cx"> document.body.appendChild(parentElement);
</span><span class="cx"> parentElement.style.font = "10px Ahem"; // Used to resolve em font consistently.
</span><del>- parentElement.style.webkitGridDefinitionColumns = "50px 'last'";
- parentElement.style.webkitGridDefinitionRows = "'first' 2em";
</del><ins>+ parentElement.style.webkitGridTemplateColumns = "50px 'last'";
+ parentElement.style.webkitGridTemplateRows = "'first' 2em";
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> parentElement.appendChild(element);
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>- element.style.webkitGridDefinitionColumns = "inherit";
- element.style.webkitGridDefinitionRows = "inherit";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'50px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'first 20px'");
</del><ins>+ element.style.webkitGridTemplateColumns = "inherit";
+ element.style.webkitGridTemplateRows = "inherit";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'50px last'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'first 20px'");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(parentElement);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
</ins><span class="cx"> testInherit();
</span><span class="cx">
</span><span class="cx"> function testInitial()
</span><span class="lines">@@ -110,19 +111,19 @@
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><span class="cx"> element.style.width = "300px";
</span><span class="cx"> element.style.height = "150px";
</span><del>- element.style.webkitGridDefinitionColumns = "150% 'last'";
- element.style.webkitGridDefinitionRows = "'first' 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'450px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'first 150px'");
</del><ins>+ element.style.webkitGridTemplateColumns = "150% 'last'";
+ element.style.webkitGridTemplateRows = "'first' 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'450px last'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'first 150px'");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>- element.style.webkitGridDefinitionColumns = "initial";
- element.style.webkitGridDefinitionRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+ element.style.webkitGridTemplateColumns = "initial";
+ element.style.webkitGridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
</ins><span class="cx"> testInitial();
</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 (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,22 +1,22 @@
</span><del>-function testGridDefinitionsValues(element, columnValue, rowValue, computedColumnValue, computedRowValue)
</del><ins>+function testGridTemplatesValues(element, columnValue, rowValue, computedColumnValue, computedRowValue)
</ins><span class="cx"> {
</span><span class="cx"> window.element = element;
</span><span class="cx"> var elementID = element.id || "element";
</span><del>- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-definition-columns')", computedColumnValue || columnValue);
- shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-definition-rows')", computedRowValue || rowValue);
</del><ins>+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue || columnValue);
+ shouldBeEqualToString("window.getComputedStyle(" + elementID + ", '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue || rowValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testGridDefinitionsSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</del><ins>+function testGridTemplatesSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</ins><span class="cx"> {
</span><del>- checkGridDefinitionsSetJSValues(true, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue);
</del><ins>+ checkGridTemplatesSetJSValues(true, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testNonGridDefinitionsSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</del><ins>+function testNonGridTemplatesSetJSValues(columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</ins><span class="cx"> {
</span><del>- checkGridDefinitionsSetJSValues(false, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue);
</del><ins>+ checkGridTemplatesSetJSValues(false, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function checkGridDefinitionsSetJSValues(useGrid, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</del><ins>+function checkGridTemplatesSetJSValues(useGrid, columnValue, rowValue, computedColumnValue, computedRowValue, jsColumnValue, jsRowValue)
</ins><span class="cx"> {
</span><span class="cx"> window.element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="lines">@@ -26,22 +26,22 @@
</span><span class="cx"> element.style.height = "600px";
</span><span class="cx"> }
</span><span class="cx"> element.style.font = "10px Ahem"; // Used to resolve em font consistently.
</span><del>- element.style.webkitGridDefinitionColumns = columnValue;
- element.style.webkitGridDefinitionRows = rowValue;
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", computedColumnValue || columnValue);
- shouldBeEqualToString("element.style.webkitGridDefinitionColumns", jsColumnValue || columnValue);
- shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", computedRowValue || rowValue);
- shouldBeEqualToString("element.style.webkitGridDefinitionRows", jsRowValue || rowValue);
</del><ins>+ element.style.webkitGridTemplateColumns = columnValue;
+ element.style.webkitGridTemplateRows = rowValue;
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", computedColumnValue || columnValue);
+ shouldBeEqualToString("element.style.webkitGridTemplateColumns", jsColumnValue || columnValue);
+ shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", computedRowValue || rowValue);
+ shouldBeEqualToString("element.style.webkitGridTemplateRows", jsRowValue || rowValue);
</ins><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function testGridDefinitionsSetBadJSValues(columnValue, rowValue)
</del><ins>+function testGridTemplatesSetBadJSValues(columnValue, rowValue)
</ins><span class="cx"> {
</span><span class="cx"> window.element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = columnValue;
- element.style.webkitGridDefinitionRows = rowValue;
- // We can't use testSetJSValues as element.style.webkitGridDefinitionRows returns "".
- testGridDefinitionsValues(element, "none", "none");
</del><ins>+ element.style.webkitGridTemplateColumns = columnValue;
+ element.style.webkitGridTemplateRows = rowValue;
+ // We can't use testSetJSValues as element.style.webkitGridTemplateRows returns "".
+ testGridTemplatesValues(element, "none", "none");
</ins><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,94 +1,94 @@
</span><del>-description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>-debug("Test getting |grid-definition-columns| and |grid-definition-rows| set through CSS");
-testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "7px 11px", "17px 2px");
-testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%");
-testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto");
-testGridDefinitionsValues(document.getElementById("gridWithEMElement"), "100px 120px", "150px 170px");
-testGridDefinitionsValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto");
-testGridDefinitionsValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px");
-testGridDefinitionsValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)");
-testGridDefinitionsValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)");
-testGridDefinitionsValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr");
-testGridDefinitionsValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)");
</del><ins>+debug("Test getting |grid-template-columns| and |grid-template-rows| set through CSS");
+testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "7px 11px", "17px 2px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "53% 99%", "27% 52%");
+testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "auto auto", "auto auto");
+testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px 120px", "150px 170px");
+testGridTemplatesValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto");
+testGridTemplatesValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px");
+testGridTemplatesValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)");
+testGridTemplatesValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr");
+testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting grid-definition-rows and grid-definition-columns through JS");
-testNonGridDefinitionsSetJSValues("18px 22px", "66px 70px");
-testNonGridDefinitionsSetJSValues("55% 80%", "40% 63%");
-testNonGridDefinitionsSetJSValues("auto auto", "auto auto");
-testNonGridDefinitionsSetJSValues("auto 16em 22px", "56% 10em auto", "auto 160px 22px", "56% 100px auto");
-testNonGridDefinitionsSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px minmax(16px, 20px)");
-testNonGridDefinitionsSetJSValues("16em 2fr", "14fr auto", "160px 2fr");
-testNonGridDefinitionsSetJSValues("50% 12vw", "5% 85vh", "50% 96px", "5% 510px");
</del><ins>+debug("Test getting and setting grid-template-rows and grid-template-columns through JS");
+testNonGridTemplatesSetJSValues("18px 22px", "66px 70px");
+testNonGridTemplatesSetJSValues("55% 80%", "40% 63%");
+testNonGridTemplatesSetJSValues("auto auto", "auto auto");
+testNonGridTemplatesSetJSValues("auto 16em 22px", "56% 10em auto", "auto 160px 22px", "56% 100px auto");
+testNonGridTemplatesSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px minmax(16px, 20px)");
+testNonGridTemplatesSetJSValues("16em 2fr", "14fr auto", "160px 2fr");
+testNonGridTemplatesSetJSValues("50% 12vw", "5% 85vh", "50% 96px", "5% 510px");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values set from CSS");
</span><span class="cx"> var gridWithNoneAndAuto = document.getElementById("gridWithNoneAndAuto");
</span><del>-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> var gridWithNoneAndFixed = document.getElementById("gridWithNoneAndFixed");
</span><del>-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting and getting wrong values from JS");
</span><del>-testGridDefinitionsSetBadJSValues("none auto", "none auto");
-testGridDefinitionsSetBadJSValues("none 16em", "none 56%");
-testGridDefinitionsSetBadJSValues("none none", "none none");
-testGridDefinitionsSetBadJSValues("auto none", "auto none");
-testGridDefinitionsSetBadJSValues("auto none 16em", "auto 18em none");
-testGridDefinitionsSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
-testGridDefinitionsSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</del><ins>+testGridTemplatesSetBadJSValues("none auto", "none auto");
+testGridTemplatesSetBadJSValues("none 16em", "none 56%");
+testGridTemplatesSetBadJSValues("none none", "none none");
+testGridTemplatesSetBadJSValues("auto none", "auto none");
+testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
+testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
+testGridTemplatesSetBadJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw");
</ins><span class="cx"> // Negative values are not allowed.
</span><del>-testGridDefinitionsSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
-testGridDefinitionsSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</del><ins>+testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
+testGridTemplatesSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</ins><span class="cx">
</span><span class="cx"> function testInherit()
</span><span class="cx"> {
</span><span class="cx"> var parentElement = document.createElement("div");
</span><span class="cx"> document.body.appendChild(parentElement);
</span><del>- parentElement.style.webkitGridDefinitionColumns = "50px 1fr 'last'";
- parentElement.style.webkitGridDefinitionRows = "101% 'middle' 45px";
- testGridDefinitionsValues(parentElement, "50px 1fr last", "101% middle 45px");
</del><ins>+ parentElement.style.webkitGridTemplateColumns = "50px 1fr 'last'";
+ parentElement.style.webkitGridTemplateRows = "101% 'middle' 45px";
+ testGridTemplatesValues(parentElement, "50px 1fr last", "101% middle 45px");
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> parentElement.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "inherit";
- element.style.webkitGridDefinitionRows = "inherit";
- testGridDefinitionsValues(element, "50px 1fr last", "101% middle 45px");
</del><ins>+ element.style.webkitGridTemplateColumns = "inherit";
+ element.style.webkitGridTemplateRows = "inherit";
+ testGridTemplatesValues(element, "50px 1fr last", "101% middle 45px");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(parentElement);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
</ins><span class="cx"> testInherit();
</span><span class="cx">
</span><span class="cx"> function testInitial()
</span><span class="cx"> {
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "150% 'middle' 55px";
- element.style.webkitGridDefinitionRows = "1fr 'line' 2fr 'line'";
- testGridDefinitionsValues(element, "150% middle 55px", "1fr line 2fr line");
</del><ins>+ element.style.webkitGridTemplateColumns = "150% 'middle' 55px";
+ element.style.webkitGridTemplateRows = "1fr 'line' 2fr 'line'";
+ testGridTemplatesValues(element, "150% middle 55px", "1fr line 2fr line");
</ins><span class="cx">
</span><del>- element.style.webkitGridDefinitionColumns = "initial";
- element.style.webkitGridDefinitionRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+ element.style.webkitGridTemplateColumns = "initial";
+ element.style.webkitGridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
</ins><span class="cx"> testInitial();
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,117 +1,117 @@
</span><del>-description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
</del><ins>+description('Test that setting and getting grid-template-columns and grid-template-rows works as expected');
</ins><span class="cx">
</span><del>-debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
-testGridDefinitionsValues(document.getElementById("gridWithNoneElement"), "none", "none");
-testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
-testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "53%", "27%");
-testGridDefinitionsValues(document.getElementById("gridWithAutoElement"), "auto", "auto");
-testGridDefinitionsValues(document.getElementById("gridWithEMElement"), "100px", "150px");
-testGridDefinitionsValues(document.getElementById("gridWithViewPortPercentageElement"), "64px", "60px");
-testGridDefinitionsValues(document.getElementById("gridWithMinMax"), "minmax(10%, 15px)", "minmax(20px, 50%)");
-testGridDefinitionsValues(document.getElementById("gridWithMinContent"), "-webkit-min-content", "-webkit-min-content");
-testGridDefinitionsValues(document.getElementById("gridWithMaxContent"), "-webkit-max-content", "-webkit-max-content");
-testGridDefinitionsValues(document.getElementById("gridWithFraction"), "1fr", "2fr");
</del><ins>+debug("Test getting grid-template-columns and grid-template-rows set through CSS");
+testGridTemplatesValues(document.getElementById("gridWithNoneElement"), "none", "none");
+testGridTemplatesValues(document.getElementById("gridWithFixedElement"), "10px", "15px");
+testGridTemplatesValues(document.getElementById("gridWithPercentElement"), "53%", "27%");
+testGridTemplatesValues(document.getElementById("gridWithAutoElement"), "auto", "auto");
+testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px", "150px");
+testGridTemplatesValues(document.getElementById("gridWithViewPortPercentageElement"), "64px", "60px");
+testGridTemplatesValues(document.getElementById("gridWithMinMax"), "minmax(10%, 15px)", "minmax(20px, 50%)");
+testGridTemplatesValues(document.getElementById("gridWithMinContent"), "-webkit-min-content", "-webkit-min-content");
+testGridTemplatesValues(document.getElementById("gridWithMaxContent"), "-webkit-max-content", "-webkit-max-content");
+testGridTemplatesValues(document.getElementById("gridWithFraction"), "1fr", "2fr");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting wrong values for grid-definition-columns and grid-definition-rows through CSS (they should resolve to the default: 'none')");
</del><ins>+debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
</ins><span class="cx"> var gridWithFitContentElement = document.getElementById("gridWithFitContentElement");
</span><del>-testGridDefinitionsValues(gridWithFitContentElement, "none", "none");
</del><ins>+testGridTemplatesValues(gridWithFitContentElement, "none", "none");
</ins><span class="cx">
</span><span class="cx"> var gridWithFitAvailableElement = document.getElementById("gridWithFitAvailableElement");
</span><del>-testGridDefinitionsValues(gridWithFitAvailableElement, "none", "none");
</del><ins>+testGridTemplatesValues(gridWithFitAvailableElement, "none", "none");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-testGridDefinitionsValues(element, "none", "none");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+testGridTemplatesValues(element, "none", "none");
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting grid-definition-columns and grid-definition-rows through JS");
-testNonGridDefinitionsSetJSValues("18px", "66px");
-testNonGridDefinitionsSetJSValues("55%", "40%");
-testNonGridDefinitionsSetJSValues("auto", "auto");
-testNonGridDefinitionsSetJSValues("10vw", "25vh", "80px", "150px");
-testNonGridDefinitionsSetJSValues("-webkit-min-content", "-webkit-min-content");
-testNonGridDefinitionsSetJSValues("-webkit-max-content", "-webkit-max-content");
</del><ins>+debug("Test getting and setting grid-template-columns and grid-template-rows through JS");
+testNonGridTemplatesSetJSValues("18px", "66px");
+testNonGridTemplatesSetJSValues("55%", "40%");
+testNonGridTemplatesSetJSValues("auto", "auto");
+testNonGridTemplatesSetJSValues("10vw", "25vh", "80px", "150px");
+testNonGridTemplatesSetJSValues("-webkit-min-content", "-webkit-min-content");
+testNonGridTemplatesSetJSValues("-webkit-max-content", "-webkit-max-content");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test getting and setting grid-definition-columns and grid-definition-rows to minmax() values through JS");
-testNonGridDefinitionsSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)");
-testNonGridDefinitionsSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "minmax(220px, 48px)", "minmax(80px, 50px)");
-testNonGridDefinitionsSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "minmax(-webkit-min-content, 48px)", "minmax(80px, -webkit-min-content)");
-testNonGridDefinitionsSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px)");
-testNonGridDefinitionsSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)");
</del><ins>+debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
+testNonGridTemplatesSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)");
+testNonGridTemplatesSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "minmax(220px, 48px)", "minmax(80px, 50px)");
+testNonGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "minmax(-webkit-min-content, 48px)", "minmax(80px, -webkit-min-content)");
+testNonGridTemplatesSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px)");
+testNonGridTemplatesSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)");
</ins><span class="cx"> // Unit comparison should be case-insensitive.
</span><del>-testNonGridDefinitionsSetJSValues("3600Fr", "154fR", "3600fr", "154fr", "3600fr", "154fr");
</del><ins>+testNonGridTemplatesSetJSValues("3600Fr", "154fR", "3600fr", "154fr", "3600fr", "154fr");
</ins><span class="cx"> // Float values are allowed.
</span><del>-testNonGridDefinitionsSetJSValues("3.1459fr", "2.718fr");
</del><ins>+testNonGridTemplatesSetJSValues("3.1459fr", "2.718fr");
</ins><span class="cx"> // A leading '+' is allowed.
</span><del>-testNonGridDefinitionsSetJSValues("+3fr", "+4fr", "3fr", "4fr", "3fr", "4fr");
</del><ins>+testNonGridTemplatesSetJSValues("+3fr", "+4fr", "3fr", "4fr", "3fr", "4fr");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to bad values through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to bad values through JS");
</ins><span class="cx"> // No comma and only 1 argument provided.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
</del><ins>+testGridTemplatesSetBadJSValues("minmax(10px 20px)", "minmax(10px)")
</ins><span class="cx"> // Nested minmax and only 2 arguments are allowed.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)");
</ins><span class="cx"> // No breadth value and no comma.
</span><del>-testGridDefinitionsSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</del><ins>+testGridTemplatesSetBadJSValues("minmax()", "minmax(30px 30% 30em)");
</ins><span class="cx"> // Auto is not allowed inside minmax.
</span><del>-testGridDefinitionsSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
-testGridDefinitionsSetBadJSValues("-2fr", "3ffr");
-testGridDefinitionsSetBadJSValues("-2.05fr", "+-3fr");
-testGridDefinitionsSetBadJSValues("0fr", "1r");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(auto, 8vh)", "minmax(10vw, auto)");
+testGridTemplatesSetBadJSValues("-2fr", "3ffr");
+testGridTemplatesSetBadJSValues("-2.05fr", "+-3fr");
+testGridTemplatesSetBadJSValues("0fr", "1r");
</ins><span class="cx"> // A dimension doesn't allow spaces between the number and the unit.
</span><del>-testGridDefinitionsSetBadJSValues(".0000fr", "13 fr");
-testGridDefinitionsSetBadJSValues("7.-fr", "-8,0fr");
</del><ins>+testGridTemplatesSetBadJSValues(".0000fr", "13 fr");
+testGridTemplatesSetBadJSValues("7.-fr", "-8,0fr");
</ins><span class="cx"> // Negative values are not allowed.
</span><del>-testGridDefinitionsSetBadJSValues("-1px", "-6em");
-testGridDefinitionsSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
</del><ins>+testGridTemplatesSetBadJSValues("-1px", "-6em");
+testGridTemplatesSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS");
-testNonGridDefinitionsSetJSValues("18px", "66px");
-testNonGridDefinitionsSetJSValues("none", "none");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
+testNonGridTemplatesSetJSValues("18px", "66px");
+testNonGridTemplatesSetJSValues("none", "none");
</ins><span class="cx">
</span><span class="cx"> function testInherit()
</span><span class="cx"> {
</span><span class="cx"> var parentElement = document.createElement("div");
</span><span class="cx"> document.body.appendChild(parentElement);
</span><del>- parentElement.style.webkitGridDefinitionColumns = "50px 'last'";
- parentElement.style.webkitGridDefinitionRows = "'first' 101%";
</del><ins>+ parentElement.style.webkitGridTemplateColumns = "50px 'last'";
+ parentElement.style.webkitGridTemplateRows = "'first' 101%";
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> parentElement.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "inherit";
- element.style.webkitGridDefinitionRows = "inherit";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'50px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'first 101%'");
</del><ins>+ element.style.webkitGridTemplateColumns = "inherit";
+ element.style.webkitGridTemplateRows = "inherit";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'50px last'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'first 101%'");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(parentElement);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'inherit' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'inherit' through JS");
</ins><span class="cx"> testInherit();
</span><span class="cx">
</span><span class="cx"> function testInitial()
</span><span class="cx"> {
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridDefinitionColumns = "150% 'last'";
- element.style.webkitGridDefinitionRows = "'first' 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'150% last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'first 1fr'");
</del><ins>+ element.style.webkitGridTemplateColumns = "150% 'last'";
+ element.style.webkitGridTemplateRows = "'first' 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'150% last'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'first 1fr'");
</ins><span class="cx">
</span><del>- element.style.webkitGridDefinitionColumns = "initial";
- element.style.webkitGridDefinitionRows = "initial";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'");
</del><ins>+ element.style.webkitGridTemplateColumns = "initial";
+ element.style.webkitGridTemplateRows = "initial";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-columns')", "'none'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-template-rows')", "'none'");
</ins><span class="cx">
</span><span class="cx"> document.body.removeChild(element);
</span><span class="cx"> }
</span><span class="cx"> debug("");
</span><del>-debug("Test setting grid-definition-columns and grid-definition-rows to 'initial' through JS");
</del><ins>+debug("Test setting grid-template-columns and grid-template-rows to 'initial' through JS");
</ins><span class="cx"> testInitial();
</span></span></pre></div>
<a id="trunkLayoutTestsietestcentercss3griddisplaygrid001expectedhtm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> -ms-grid-rows: auto 1fr;
</span><span class="cx"> -moz-grid-rows: auto 1fr;
</span><span class="cx"> -o-grid-rows: auto 1fr;
</span><del>- -webkit-grid-definition-rows: auto 1fr;
</del><ins>+ -webkit-grid-template-rows: auto 1fr;
</ins><span class="cx"> grid-rows: auto 1fr;
</span><span class="cx"> }
</span><span class="cx"> #title
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-07 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax
+ https://bugs.webkit.org/show_bug.cgi?id=127989
+
+ Reviewed by Andreas Kling.
+
+ In the latest WD, grid-definition-{columns|rows} were renamed to grid-template-{columns|rows}.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::isLayoutDependent):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPropertyNames.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
</ins><span class="cx"> 2014-02-07 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CTTE: DocumentThreadableLoader always has a Document.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -286,8 +286,8 @@
</span><span class="cx"> CSSPropertyWebkitGridAutoRows,
</span><span class="cx"> CSSPropertyWebkitGridColumnEnd,
</span><span class="cx"> CSSPropertyWebkitGridColumnStart,
</span><del>- CSSPropertyWebkitGridDefinitionColumns,
- CSSPropertyWebkitGridDefinitionRows,
</del><ins>+ CSSPropertyWebkitGridTemplateColumns,
+ CSSPropertyWebkitGridTemplateRows,
</ins><span class="cx"> CSSPropertyWebkitGridRowEnd,
</span><span class="cx"> CSSPropertyWebkitGridRowStart,
</span><span class="cx"> CSSPropertyWebkitHighlight,
</span><span class="lines">@@ -1536,8 +1536,8 @@
</span><span class="cx"> switch (propertyID) {
</span><span class="cx"> case CSSPropertyWidth:
</span><span class="cx"> case CSSPropertyHeight:
</span><del>- case CSSPropertyWebkitGridDefinitionColumns:
- case CSSPropertyWebkitGridDefinitionRows:
</del><ins>+ case CSSPropertyWebkitGridTemplateColumns:
+ case CSSPropertyWebkitGridTemplateRows:
</ins><span class="cx"> case CSSPropertyWebkitPerspectiveOrigin:
</span><span class="cx"> case CSSPropertyWebkitTransformOrigin:
</span><span class="cx"> case CSSPropertyWebkitTransform:
</span><span class="lines">@@ -2081,9 +2081,9 @@
</span><span class="cx"> case CSSPropertyWebkitGridAutoRows:
</span><span class="cx"> return specifiedValueForGridTrackSize(style->gridAutoRows(), style.get(), m_node->document().renderView());
</span><span class="cx">
</span><del>- case CSSPropertyWebkitGridDefinitionColumns:
</del><ins>+ case CSSPropertyWebkitGridTemplateColumns:
</ins><span class="cx"> return valueForGridTrackList(ForColumns, renderer, style.get(), m_node->document().renderView());
</span><del>- case CSSPropertyWebkitGridDefinitionRows:
</del><ins>+ case CSSPropertyWebkitGridTemplateRows:
</ins><span class="cx"> return valueForGridTrackList(ForRows, renderer, style.get(), m_node->document().renderView());
</span><span class="cx">
</span><span class="cx"> case CSSPropertyWebkitGridColumnStart:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -2568,8 +2568,8 @@
</span><span class="cx"> parsedValue = parseGridTrackSize(*m_valueList);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case CSSPropertyWebkitGridDefinitionColumns:
- case CSSPropertyWebkitGridDefinitionRows:
</del><ins>+ case CSSPropertyWebkitGridTemplateColumns:
+ case CSSPropertyWebkitGridTemplateRows:
</ins><span class="cx"> if (!cssGridLayoutEnabled())
</span><span class="cx"> return false;
</span><span class="cx"> return parseGridTrackList(propId, important);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -304,8 +304,8 @@
</span><span class="cx"> -webkit-grid-auto-rows
</span><span class="cx"> -webkit-grid-column-end
</span><span class="cx"> -webkit-grid-column-start
</span><del>--webkit-grid-definition-columns
--webkit-grid-definition-rows
</del><ins>+-webkit-grid-template-columns
+-webkit-grid-template-rows
</ins><span class="cx"> -webkit-grid-row-end
</span><span class="cx"> -webkit-grid-row-start
</span><span class="cx"> -webkit-grid-column
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (163624 => 163625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-07 17:43:12 UTC (rev 163624)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-07 17:45:49 UTC (rev 163625)
</span><span class="lines">@@ -2655,7 +2655,7 @@
</span><span class="cx"> state.style()->setGridAutoRows(trackSize);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case CSSPropertyWebkitGridDefinitionColumns: {
</del><ins>+ case CSSPropertyWebkitGridTemplateColumns: {
</ins><span class="cx"> if (isInherit) {
</span><span class="cx"> m_state.style()->setGridColumns(m_state.parentStyle()->gridColumns());
</span><span class="cx"> m_state.style()->setNamedGridColumnLines(m_state.parentStyle()->namedGridColumnLines());
</span><span class="lines">@@ -2674,7 +2674,7 @@
</span><span class="cx"> state.style()->setNamedGridColumnLines(namedGridLines);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- case CSSPropertyWebkitGridDefinitionRows: {
</del><ins>+ case CSSPropertyWebkitGridTemplateRows: {
</ins><span class="cx"> if (isInherit) {
</span><span class="cx"> m_state.style()->setGridRows(m_state.parentStyle()->gridRows());
</span><span class="cx"> m_state.style()->setNamedGridRowLines(m_state.parentStyle()->namedGridRowLines());
</span></span></pre>
</div>
</div>
</body>
</html>