<!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>[140480] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/140480">140480</a></dd>
<dt>Author</dt> <dd>jchaffraix@webkit.org</dd>
<dt>Date</dt> <dd>2013-01-22 15:33:18 -0800 (Tue, 22 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Add grid.css to hold the common grid testing code
https://bugs.webkit.org/show_bug.cgi?id=107044
Reviewed by Tony Chang.
* fast/css-grid-layout/containing-block-grids.html:
Removed 2 bad display: none rules that where overriden by
the inline style declaration.
* fast/css-grid-layout/minmax-fixed-logical-height-only.html:
* fast/css-grid-layout/breadth-size-resolution-grid.html:
* fast/css-grid-layout/calc-resolution-grid-item.html:
* fast/css-grid-layout/display-grid-set-get.html:
* 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-element-padding-margin.html:
* fast/css-grid-layout/minmax-fixed-logical-width-only.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/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:
Updated all the files above to:
- use grid.css.
- rename 'a', 'b', 'c' and 'd' to more meaningful.
- change the previous ids to be classes as we ended up having several divs with the same id.
* fast/css-grid-layout/resources/grid.css: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkLayoutTestsfastcssgridlayoutcontainingblockgridshtml">trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutdisplaygridsetgethtml">trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html</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="#trunkLayoutTestsfastcssgridlayoutgridelementpaddingmarginhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.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="#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="#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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcss">trunk/LayoutTests/fast/css-grid-layout/resources/grid.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/ChangeLog 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2013-01-22 Julien Chaffraix <jchaffraix@webkit.org>
+
+ [CSS Grid Layout] Add grid.css to hold the common grid testing code
+ https://bugs.webkit.org/show_bug.cgi?id=107044
+
+ Reviewed by Tony Chang.
+
+ * fast/css-grid-layout/containing-block-grids.html:
+ Removed 2 bad display: none rules that where overriden by
+ the inline style declaration.
+
+ * fast/css-grid-layout/minmax-fixed-logical-height-only.html:
+ * fast/css-grid-layout/breadth-size-resolution-grid.html:
+ * fast/css-grid-layout/calc-resolution-grid-item.html:
+ * fast/css-grid-layout/display-grid-set-get.html:
+ * 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-element-padding-margin.html:
+ * fast/css-grid-layout/minmax-fixed-logical-width-only.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/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:
+ Updated all the files above to:
+ - use grid.css.
+ - rename 'a', 'b', 'c' and 'd' to more meaningful.
+ - change the previous ids to be classes as we ended up having several divs with the same id.
+
+ * fast/css-grid-layout/resources/grid.css: Added.
+
</ins><span class="cx"> 2013-01-22 Ojan Vafai <ojan@chromium.org>
</span><span class="cx">
</span><span class="cx"> REGRESION(r130774): preferred width of tables does not take max-width into account
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutbreadthsizeresolutiongridhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,49 +4,32 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 100px 10vw;
</span><span class="cx"> -webkit-grid-rows: 10vh 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#b {
- background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+.firstRowSecondColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+.secondRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
</del><ins>+.secondRowSecondColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -54,24 +37,24 @@
</span><span class="cx"> <p>Test that specifying the track breadth sizes works properly with all the allowed length types and in different writing modes.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" data-expected-width="100" data-expected-height="60"></div>
- <div id="b" data-expected-width="80" data-expected-height="60"></div>
- <div id="c" data-expected-width="100" data-expected-height="100"></div>
- <div id="d" data-expected-width="80" data-expected-height="100"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="100" data-expected-height="60"></div>
+ <div class="firstRowSecondColumn" data-expected-width="80" data-expected-height="60"></div>
+ <div class="secondRowFirstColumn" data-expected-width="100" data-expected-height="100"></div>
+ <div class="secondRowSecondColumn" data-expected-width="80" data-expected-height="100"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid verticalRL">
</span><del>- <div id="a" data-expected-width="60" data-expected-height="100"></div>
- <div id="b" data-expected-width="60" data-expected-height="80"></div>
- <div id="c" data-expected-width="100" data-expected-height="100"></div>
- <div id="d" data-expected-width="100" data-expected-height="80"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="60" data-expected-height="100"></div>
+ <div class="firstRowSecondColumn" data-expected-width="60" data-expected-height="80"></div>
+ <div class="secondRowFirstColumn" data-expected-width="100" data-expected-height="100"></div>
+ <div class="secondRowSecondColumn" data-expected-width="100" data-expected-height="80"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="verticalRL" data-expected-width="100" data-expected-height="60"></div>
- <div id="b" data-expected-width="80" data-expected-height="60"></div>
- <div id="c" class="verticalRL" data-expected-width="100" data-expected-height="100"></div>
- <div id="d" data-expected-width="80" data-expected-height="100"></div>
</del><ins>+ <div class="firstRowFirstColumn" class="verticalRL" data-expected-width="100" data-expected-height="60"></div>
+ <div class="firstRowSecondColumn" data-expected-width="80" data-expected-height="60"></div>
+ <div class="secondRowFirstColumn" class="verticalRL" data-expected-width="100" data-expected-height="100"></div>
+ <div class="secondRowSecondColumn" data-expected-width="80" data-expected-height="100"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutcalcresolutiongriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,40 +4,15 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 100px 300px;
</span><span class="cx"> -webkit-grid-rows: 50px 150px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
-}
-
-#b {
- background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
-}
-
-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
-}
-
-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
-}
-
</del><span class="cx"> .calcWidth {
</span><span class="cx"> width: -webkit-calc(80% + 20%);
</span><span class="cx"> height: 15px;
</span><span class="lines">@@ -52,10 +27,6 @@
</span><span class="cx"> width: -webkit-calc(80% + 20px);
</span><span class="cx"> height: -webkit-calc(70% + 30%);
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -63,31 +34,31 @@
</span><span class="cx"> <p>Test that resolving calc lengths on grid items works properly on a fixed grid with different writing modes.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="calcWidth" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="calcHeight" data-expected-width="15" data-expected-height="60"></div>
- <div id="c" class="calcHeightAndWidth" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="calcHeightAndWidth" data-expected-width="260" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn calcWidth" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn calcHeight" data-expected-width="15" data-expected-height="60"></div>
+ <div class="secondRowFirstColumn calcHeightAndWidth" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn calcHeightAndWidth" data-expected-width="260" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid verticalRL">
</span><del>- <div id="a" class="calcWidth" data-expected-width="50" data-expected-height="15"></div>
- <div id="b" class="calcHeight" data-expected-width="15" data-expected-height="260"></div>
- <div id="c" class="calcHeightAndWidth" data-expected-width="140" data-expected-height="100"></div>
- <div id="d" class="calcHeightAndWidth" data-expected-width="140" data-expected-height="300"></div>
</del><ins>+ <div class="firstRowFirstColumn calcWidth" data-expected-width="50" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn calcHeight" data-expected-width="15" data-expected-height="260"></div>
+ <div class="secondRowFirstColumn calcHeightAndWidth" data-expected-width="140" data-expected-height="100"></div>
+ <div class="secondRowSecondColumn calcHeightAndWidth" data-expected-width="140" data-expected-height="300"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="calcWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="calcHeight verticalRL" data-expected-width="15" data-expected-height="60"></div>
- <div id="c" class="calcHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="calcHeightAndWidth verticalRL" data-expected-width="260" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn calcWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn calcHeight verticalRL" data-expected-width="15" data-expected-height="60"></div>
+ <div class="secondRowFirstColumn calcHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn calcHeightAndWidth verticalRL" data-expected-width="260" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="calcWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="calcHeight" data-expected-width="15" data-expected-height="60"></div>
- <div id="c" class="calcHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="calcHeightAndWidth" data-expected-width="260" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn calcWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn calcHeight" data-expected-width="15" data-expected-height="60"></div>
+ <div class="secondRowFirstColumn calcHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn calcHeightAndWidth" data-expected-width="260" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutcontainingblockgridshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/containing-block-grids.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -5,15 +5,16 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+ <link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> div { width: 100px; height: 100px; }
</span><del>- .relative-positioned-grid { display: none; background-color: red; position:relative; }
- .relative-positioned-inline-grid { display: none; background-color: red; position: relative; }
</del><ins>+ .relative-positioned-grid { background-color: red; position:relative; }
+ .relative-positioned-inline-grid { background-color: red; position: relative; }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Grids can act as containing blocks for positioned content.</p>
</span><del>-<div class="relative-positioned-grid" style="display: -webkit-grid"><div style="background-color: green; left: 0; top: 0"></div></div>
-<div class="relative-positioned-inline-grid" style="display: -webkit-inline-grid"><div style="background-color:green; left: 0; top: 0"></div></div>
</del><ins>+<div class="relative-positioned-grid grid"><div style="background-color: green; left: 0; top: 0"></div></div>
+<div class="relative-positioned-inline-grid inline-grid"><div style="background-color:green; left: 0; top: 0"></div></div>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutdisplaygridsetgethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/display-grid-set-get.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -5,15 +5,12 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><del>-<style>
-.grid { display: -webkit-grid; }
-.inlineGrid { display: -webkit-inline-grid; }
-</style>
</del><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <script src="../js/resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div class="grid" id="gridElement"></div>
</span><del>-<div class="inlineGrid" id="inlineGridElement"></div>
</del><ins>+<div class="inline-grid" id="inlineGridElement"></div>
</ins><span class="cx"> <script src="resources/display-grid-set-get.js"></script>
</span><span class="cx"> <script src="../js/resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -5,68 +5,57 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridWithFixed {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 7px 11px;
</span><span class="cx"> -webkit-grid-rows: 17px 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithPercent {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 53% 99%;
</span><span class="cx"> -webkit-grid-rows: 27% 52%;
</span><span class="cx"> }
</span><span class="cx"> .gridWithAuto {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: auto auto;
</span><span class="cx"> -webkit-grid-rows: auto auto;
</span><span class="cx"> }
</span><span class="cx"> .gridWithEM {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 10em 12em;
</span><span class="cx"> -webkit-grid-rows: 15em 17em;
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithNoneAndAuto {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: none auto;
</span><span class="cx"> -webkit-grid-rows: none auto;
</span><span class="cx"> }
</span><span class="cx"> .gridNoneWithAndFixed {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: none 15px;
</span><span class="cx"> -webkit-grid-rows: none 22px;
</span><span class="cx"> }
</span><span class="cx"> .gridWithThreeItems {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 15px auto 10em;
</span><span class="cx"> -webkit-grid-rows: 12em 18px auto;
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithPercentAndViewportPercent {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 50% 15vw;
</span><span class="cx"> -webkit-grid-rows: 35% 28vh;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFitContentAndFitAvailable {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: -webkit-content-available;
</span><span class="cx"> -webkit-grid-rows: -webkit-fitcontent -webkit-fit-available;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxContent {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: -webkit-min-content -webkit-max-content;
</span><span class="cx"> -webkit-grid-rows: -webkit-max-content -webkit-min-content;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndFixed {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: minmax(45px, 30%) 15px;
</span><span class="cx"> -webkit-grid-rows: 12em minmax(35%, 10px);
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndMinMaxContent {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: minmax(-webkit-min-content, 30%) 15px;
</span><span class="cx"> -webkit-grid-rows: 12em minmax(35%, -webkit-max-content);
</span><span class="cx"> font: 10px Ahem;
</span><span class="lines">@@ -75,18 +64,18 @@
</span><span class="cx"> <script src="../js/resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div class="gridWithFixed" id="gridWithFixedElement"></div>
-<div class="gridWithPercent" id="gridWithPercentElement"></div>
-<div class="gridWithAuto" id="gridWithAutoElement"></div>
-<div class="gridWithEM" id="gridWithEMElement"></div>
-<div class="gridWithNoneAndAuto" id="gridWithNoneAndAuto"></div>
-<div class="gridWithNoneAndFixed" id="gridWithNoneAndFixed"></div>
-<div class="gridWithThreeItems" id="gridWithThreeItems"></div>
-<div class="gridWithPercentAndViewportPercent" id="gridWithPercentAndViewportPercent"></div>
-<div class="gridWithFitContentAndFitAvailable" id="gridWithFitContentAndFitAvailable"></div>
-<div class="gridWithMinMaxContent" id="gridWithMinMaxContent"></div>
-<div class="gridWithMinMaxAndFixed" id="gridWithMinMaxAndFixed"></div>
-<div class="gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxContent"></div>
</del><ins>+<div class="grid gridWithFixed" id="gridWithFixedElement"></div>
+<div class="grid gridWithPercent" id="gridWithPercentElement"></div>
+<div class="grid gridWithAuto" id="gridWithAutoElement"></div>
+<div class="grid gridWithEM" id="gridWithEMElement"></div>
+<div class="grid gridWithNoneAndAuto" id="gridWithNoneAndAuto"></div>
+<div class="grid gridWithNoneAndFixed" id="gridWithNoneAndFixed"></div>
+<div class="grid gridWithThreeItems" id="gridWithThreeItems"></div>
+<div class="grid gridWithPercentAndViewportPercent" id="gridWithPercentAndViewportPercent"></div>
+<div class="grid gridWithFitContentAndFitAvailable" id="gridWithFitContentAndFitAvailable"></div>
+<div class="grid gridWithMinMaxContent" id="gridWithMinMaxContent"></div>
+<div class="grid gridWithMinMaxAndFixed" id="gridWithMinMaxAndFixed"></div>
+<div class="grid gridWithMinMaxAndMinMaxContent" id="gridWithMinMaxAndMinMaxContent"></div>
</ins><span class="cx"> <script src="resources/grid-columns-rows-get-set-multiple.js"></script>
</span><span class="cx"> <script src="../js/resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -5,10 +5,8 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><del>-.grid {
- display: -webkit-grid;
-}
</del><span class="cx"> .gridWithNone {
</span><span class="cx"> -webkit-grid-columns: none;
</span><span class="cx"> -webkit-grid-rows: none;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementpaddingmarginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,10 +4,9 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 100px;
</span><span class="cx"> -webkit-grid-rows: 50px;
</span><span class="cx"> /* Force the grid element to be shrink-to-fit. */
</span><span class="lines">@@ -23,10 +22,6 @@
</span><span class="cx"> border-color: green;
</span><span class="cx"> border-width: 10px 20px 30px 40px;
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,10 +4,9 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> width: 100px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> }
</span><span class="lines">@@ -48,22 +47,15 @@
</span><span class="cx"> -webkit-writing-mode: horizontal-bt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+.secondRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -72,33 +64,33 @@
</span><span class="cx"> <p>Checks that a grid element with fixed minmax properly compute the logical height in several writing-mode.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid1" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="40" data-expected-width="30"></div>
- <div id="b" data-expected-height="160" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="40" data-expected-width="30"></div>
+ <div class="secondRowFirstColumn" data-expected-height="160" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid2" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="120" data-expected-width="30"></div>
- <div id="b" data-expected-height="80" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="120" data-expected-width="30"></div>
+ <div class="secondRowFirstColumn" data-expected-height="80" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid3" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="90" data-expected-width="30"></div>
- <div id="b" data-expected-height="110" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="90" data-expected-width="30"></div>
+ <div class="secondRowFirstColumn" data-expected-height="110" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid4" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="40"></div>
- <div id="b" data-expected-height="30" data-expected-width="60"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="40"></div>
+ <div class="secondRowFirstColumn" data-expected-height="30" data-expected-width="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid5" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="90"></div>
- <div id="b" data-expected-height="30" data-expected-width="10"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="90"></div>
+ <div class="secondRowFirstColumn" data-expected-height="30" data-expected-width="10"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid6" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="90" data-expected-width="30"></div>
- <div id="b" data-expected-height="110" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="90" data-expected-width="30"></div>
+ <div class="secondRowFirstColumn" data-expected-height="110" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,10 +4,9 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> width: 100px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> }
</span><span class="lines">@@ -49,22 +48,15 @@
</span><span class="cx"> -webkit-writing-mode: horizontal-bt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+.firstRowSecondColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -73,33 +65,33 @@
</span><span class="cx"> <p>Checks that a grid element with fixed minmax properly compute the logical width in several writing-mode.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid1" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="40"></div>
- <div id="b" data-expected-height="30" data-expected-width="60"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="40"></div>
+ <div class="firstRowSecondColumn" data-expected-height="30" data-expected-width="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid2" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="60"></div>
- <div id="b" data-expected-height="30" data-expected-width="40"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="60"></div>
+ <div class="firstRowSecondColumn" data-expected-height="30" data-expected-width="40"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid3" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="50"></div>
- <div id="b" data-expected-height="30" data-expected-width="50"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="50"></div>
+ <div class="firstRowSecondColumn" data-expected-height="30" data-expected-width="50"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid4" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="40" data-expected-width="30"></div>
- <div id="b" data-expected-height="160" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="40" data-expected-width="30"></div>
+ <div class="firstRowSecondColumn" data-expected-height="160" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid5" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="100" data-expected-width="30"></div>
- <div id="b" data-expected-height="100" data-expected-width="30"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="100" data-expected-width="30"></div>
+ <div class="firstRowSecondColumn" data-expected-height="100" data-expected-width="30"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid" id="grid6" data-expected-width="100" data-expected-height="200">
</span><del>- <div id="a" data-expected-height="30" data-expected-width="40"></div>
- <div id="b" data-expected-height="30" data-expected-width="60"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-height="30" data-expected-width="40"></div>
+ <div class="firstRowSecondColumn" data-expected-height="30" data-expected-width="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,17 +4,14 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: minmax(-webkit-min-content, 40px);
</span><span class="cx"> -webkit-grid-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: minmax(30px, -webkit-min-content);
</span><span class="cx"> -webkit-grid-rows: 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -25,10 +22,7 @@
</span><span class="cx"> height: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> /* Make us fit our grid area. */
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -41,68 +35,68 @@
</span><span class="cx"> <p>Test that resolving minmax function with min-content on grid items works properly.</p>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="50">XXX XXX XXX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="50">XXX XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
</del><ins>+ <div class="grid gridMinMinContent">
</ins><span class="cx"> <!-- The 'max' logical width ends up being smaller than the 'min' so per the spec we ignore the 'max'. -->
</span><del>- <div id="a" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX XXXXX</div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="20" data-expected-height="50">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="20" data-expected-height="50">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx"> <div style="width: 40px; height: 10px">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="40" data-expected-height="50">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="40" data-expected-height="50">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 10px;">
</span><del>- <div class="gridMinMinContent">
</del><ins>+ <div class="grid gridMinMinContent">
</ins><span class="cx"> <!-- The 'max' logical width ends up being smaller than the 'min' so per the spec we ignore the 'max'. -->
</span><del>- <div id="a" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX XXXXX</div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="30" data-expected-height="20">XXX XXX XXX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="20">XXX XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="30" data-expected-height="20">XXXXX XXXXX XXXXX XXXXX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="20">XXXXX XXXXX XXXXX XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="30" data-expected-height="20">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="20">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 20px">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="50" data-expected-height="20">XXXXX XXXXX XXXXX XXXXX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="20">XXXXX XXXXX XXXXX XXXXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 20px">
</span><del>- <div class="gridMaxMinContent">
</del><ins>+ <div class="grid gridMaxMinContent">
</ins><span class="cx"> <!-- The 'max' logical width ends up being smaller than the 'min' so per the spec we ignore the 'max'. -->
</span><del>- <div id="a" data-expected-width="30" data-expected-height="20">XX XX XX XX XX XX</div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="20">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,17 +4,14 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 30px;
</span><span class="cx"> -webkit-grid-rows: minmax(-webkit-min-content, 40px);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 30px;
</span><span class="cx"> -webkit-grid-rows: minmax(30px, -webkit-min-content);
</span><span class="cx"> }
</span><span class="lines">@@ -25,10 +22,7 @@
</span><span class="cx"> height: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> /* Make us fit our grid area. */
</span><span class="cx"> width: 100%;
</span><span class="lines">@@ -41,61 +35,61 @@
</span><span class="cx"> <p>Test that resolving minmax function with min-content on grid items works properly.</p>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="20">XXX XXX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="20">XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="40">XXX XXX XXX XXX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="40">XXX XXX XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx"> <div style="width: 30px; height: 100px">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="40">XXX XXX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="40">XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 30px; height: 100px">
</span><del>- <div class="gridMinMinContent">
- <div id="a" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMinMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMaxMinContent">
</del><ins>+ <div class="grid gridMaxMinContent">
</ins><span class="cx"> <!-- The 'max' logical width ends up being smaller than the 'min' so per the spec we ignore the 'max'. -->
</span><del>- <div id="a" data-expected-width="30" data-expected-height="30">XXX XXX</div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="30">XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="30" data-expected-height="30">XXX XXX XXX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="30">XXX XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx">
</span><span class="cx"> <div style="width: 30px; height: 100px">
</span><del>- <div class="gridMaxMinContent">
- <div id="a" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</del><ins>+ <div class="grid gridMaxMinContent">
+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="60">XX XX XX XX XX XX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 30px; height: 100px">
</span><del>- <div class="gridMaxMinContent">
</del><ins>+ <div class="grid gridMaxMinContent">
</ins><span class="cx"> <!-- The 'max' logical width ends up being smaller than the 'min' so per the spec we ignore the 'max'. -->
</span><del>- <div id="a" data-expected-width="30" data-expected-height="30">XXX XXX</div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="30">XXX XXX</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</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 (140479 => 140480)</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 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .container {
</span><span class="cx"> position: relative;
</span><span class="lines">@@ -12,39 +13,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 40% 60%;
</span><span class="cx"> -webkit-grid-rows: 30% 70%;
</span><del>- background-color: grey;
</del><span class="cx"> width: 80%;
</span><span class="cx"> height: 50%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+
+.firstRowSecondColumn {
</ins><span class="cx"> width: 15px;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-#c {
- background-color: red;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowFirstColumn {
</ins><span class="cx"> width: 50%;
</span><span class="cx"> height: 50%;
</span><span class="cx"> }
</span><del>-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowSecondColumn {
</ins><span class="cx"> width: -webkit-calc(100%);
</span><span class="cx"> height: -webkit-calc(100%);
</span><span class="cx"> }
</span><span class="lines">@@ -56,37 +46,37 @@
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="80" data-expected-height="105"></div>
- <div id="d" data-expected-width="240" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: horizontal-bt" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="80" data-expected-height="105"></div>
- <div id="d" data-expected-width="240" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-rl;" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="120" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="180"></div>
- <div id="c" data-expected-width="140" data-expected-height="60"></div>
- <div id="d" data-expected-width="280" data-expected-height="180"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="120" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="180"></div>
+ <div class="secondRowFirstColumn" data-expected-width="140" data-expected-height="60"></div>
+ <div class="secondRowSecondColumn" data-expected-width="280" data-expected-height="180"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-lr;" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="120" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="180"></div>
- <div id="c" data-expected-width="140" data-expected-height="60"></div>
- <div id="d" data-expected-width="280" data-expected-height="180"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="120" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="180"></div>
+ <div class="secondRowFirstColumn" data-expected-width="140" data-expected-height="60"></div>
+ <div class="secondRowSecondColumn" data-expected-width="280" data-expected-height="180"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,41 +4,31 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 70% 30%;
</span><span class="cx"> -webkit-grid-rows: 40% 60%;
</span><del>- background-color: grey;
</del><span class="cx"> width: 400px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+
+.firstRowSecondColumn {
</ins><span class="cx"> width: 15px;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowFirstColumn {
</ins><span class="cx"> width: 50%;
</span><span class="cx"> height: 50%;
</span><span class="cx"> }
</span><del>-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowSecondColumn {
</ins><span class="cx"> width: -webkit-calc(100%);
</span><span class="cx"> height: -webkit-calc(100%);
</span><span class="cx"> }
</span><span class="lines">@@ -68,28 +58,28 @@
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="120"></div>
- <div id="c" data-expected-width="80" data-expected-height="90"></div>
- <div id="d" data-expected-width="240" data-expected-height="180"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="120"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="90"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="180"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="280" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="140" data-expected-height="105"></div>
- <div id="d" data-expected-width="120" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="280" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="140" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="120" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="80" data-expected-height="105"></div>
- <div id="d" data-expected-width="240" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,41 +4,31 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 40% 60%;
</span><span class="cx"> -webkit-grid-rows: 30% 70%;
</span><del>- background-color: grey;
</del><span class="cx"> width: 400px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+
+.firstRowSecondColumn {
</ins><span class="cx"> width: 15px;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-#c {
- background-color: red;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowFirstColumn {
</ins><span class="cx"> width: 50%;
</span><span class="cx"> height: 50%;
</span><span class="cx"> }
</span><del>-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowSecondColumn {
</ins><span class="cx"> width: -webkit-calc(100%);
</span><span class="cx"> height: -webkit-calc(100%);
</span><span class="cx"> }
</span><span class="lines">@@ -50,37 +40,37 @@
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="80" data-expected-height="105"></div>
- <div id="d" data-expected-width="240" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: horizontal-bt" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="160" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="90"></div>
- <div id="c" data-expected-width="80" data-expected-height="105"></div>
- <div id="d" data-expected-width="240" data-expected-height="210"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="160" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="90"></div>
+ <div class="secondRowFirstColumn" data-expected-width="80" data-expected-height="105"></div>
+ <div class="secondRowSecondColumn" data-expected-width="240" data-expected-height="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-rl;" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="120" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="180"></div>
- <div id="c" data-expected-width="140" data-expected-height="60"></div>
- <div id="d" data-expected-width="280" data-expected-height="180"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="120" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="180"></div>
+ <div class="secondRowFirstColumn" data-expected-width="140" data-expected-height="60"></div>
+ <div class="secondRowSecondColumn" data-expected-width="280" data-expected-height="180"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-lr;" data-expected-width="400" data-expected-height="300">
</span><del>- <div id="a" data-expected-width="120" data-expected-height="15"></div>
- <div id="b" data-expected-width="15" data-expected-height="180"></div>
- <div id="c" data-expected-width="140" data-expected-height="60"></div>
- <div id="d" data-expected-width="280" data-expected-height="180"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-expected-width="120" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn" data-expected-width="15" data-expected-height="180"></div>
+ <div class="secondRowFirstColumn" data-expected-width="140" data-expected-height="60"></div>
+ <div class="secondRowSecondColumn" data-expected-width="280" data-expected-height="180"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,40 +4,15 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 200px 200px;
</span><span class="cx"> -webkit-grid-rows: 100px 100px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
-}
-
-#b {
- background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
-}
-
-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
-}
-
-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
-}
-
</del><span class="cx"> .percentPadding {
</span><span class="cx"> width: 0px;
</span><span class="cx"> height: 0px;
</span><span class="lines">@@ -56,10 +31,6 @@
</span><span class="cx"> padding: 10%;
</span><span class="cx"> margin: 20%;
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <script>
</span><span class="lines">@@ -78,10 +49,10 @@
</span><span class="cx"> <p>Test that changing grid tracks size forces the grid items' to resolve percentage padding and margin</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
- <div id="b" class="percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
- <div id="c" class="percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
- <div id="d" class="percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</del><ins>+ <div class="firstRowFirstColumn percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
+ <div class="firstRowSecondColumn percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
+ <div class="secondRowFirstColumn percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
+ <div class="secondRowSecondColumn percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</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 (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,40 +4,15 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 100px 300px;
</span><span class="cx"> -webkit-grid-rows: 50px 150px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
-}
-
-#b {
- background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
-}
-
-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
-}
-
-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
-}
-
</del><span class="cx"> .percentPadding {
</span><span class="cx"> width: 0px;
</span><span class="cx"> height: 0px;
</span><span class="lines">@@ -56,10 +31,6 @@
</span><span class="cx"> padding: 10%;
</span><span class="cx"> margin: 20%;
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -67,31 +38,31 @@
</span><span class="cx"> <p>Test that resolving percentage padding and margin on grid items works properly on a fixed grid with different writing modes.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
- <div id="b" class="percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
- <div id="c" class="percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
- <div id="d" class="percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</del><ins>+ <div class="firstRowFirstColumn percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
+ <div class="firstRowSecondColumn percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
+ <div class="secondRowFirstColumn percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
+ <div class="secondRowSecondColumn percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid verticalRL">
</span><del>- <div id="a" class="percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
- <div id="b" class="percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
- <div id="c" class="percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
- <div id="d" class="percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</del><ins>+ <div class="firstRowFirstColumn percentPadding" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
+ <div class="firstRowSecondColumn percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
+ <div class="secondRowFirstColumn percentPaddingAndMargin" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
+ <div class="secondRowSecondColumn percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentPadding verticalRL" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
- <div id="b" class="percentMargin verticalRL" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
- <div id="c" class="percentPaddingAndMargin verticalRL" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
- <div id="d" class="percentPaddingAndMargin verticalRL" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</del><ins>+ <div class="firstRowFirstColumn percentPadding verticalRL" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
+ <div class="firstRowSecondColumn percentMargin verticalRL" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
+ <div class="secondRowFirstColumn percentPaddingAndMargin verticalRL" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
+ <div class="secondRowSecondColumn percentPaddingAndMargin verticalRL" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentPadding verticalRL" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
- <div id="b" class="percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
- <div id="c" class="percentPaddingAndMargin verticalRL" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
- <div id="d" class="percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</del><ins>+ <div class="firstRowFirstColumn percentPadding verticalRL" data-expected-padding-top="50" data-expected-padding-right="50" data-expected-padding-bottom="50" data-expected-padding-left="50"></div>
+ <div class="firstRowSecondColumn percentMargin" data-expected-margin-top="150" data-expected-margin-right="150" data-expected-margin-bottom="150" data-expected-margin-left="150"></div>
+ <div class="secondRowFirstColumn percentPaddingAndMargin verticalRL" data-expected-padding-top="10" data-expected-padding-right="10" data-expected-padding-bottom="10" data-expected-padding-left="10" data-expected-margin-top="20" data-expected-margin-right="20" data-expected-margin-bottom="20" data-expected-margin-left="20"></div>
+ <div class="secondRowSecondColumn percentPaddingAndMargin" data-expected-padding-top="30" data-expected-padding-right="30" data-expected-padding-bottom="30" data-expected-padding-left="30" data-expected-margin-top="60" data-expected-margin-right="60" data-expected-margin-bottom="60" data-expected-margin-left="60"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentresolutiongriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,40 +4,15 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
- background-color: grey;
</del><span class="cx"> -webkit-grid-columns: 100px 300px;
</span><span class="cx"> -webkit-grid-rows: 50px 150px;
</span><span class="cx"> height: 200px;
</span><span class="cx"> width: 400px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
-}
-
-#b {
- background-color: lime;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
-}
-
-#c {
- background-color: purple;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
-}
-
-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
-}
-
</del><span class="cx"> .percentWidth {
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: 15px;
</span><span class="lines">@@ -52,10 +27,6 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><del>-
-.verticalRL {
- -webkit-writing-mode: vertical-rl;
-}
</del><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.grid')">
</span><span class="lines">@@ -63,31 +34,31 @@
</span><span class="cx"> <p>Test that resolving percent lengths on grid items works properly on a fixed grid with different writing modes.</p>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentWidth" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="percentHeight" data-expected-width="15" data-expected-height="50"></div>
- <div id="c" class="percentHeightAndWidth" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="percentHeightAndWidth" data-expected-width="300" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn percentWidth" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn percentHeight" data-expected-width="15" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn percentHeightAndWidth" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn percentHeightAndWidth" data-expected-width="300" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid verticalRL">
</span><del>- <div id="a" class="percentWidth" data-expected-width="50" data-expected-height="15"></div>
- <div id="b" class="percentHeight" data-expected-width="15" data-expected-height="300"></div>
- <div id="c" class="percentHeightAndWidth" data-expected-width="150" data-expected-height="100"></div>
- <div id="d" class="percentHeightAndWidth" data-expected-width="150" data-expected-height="300"></div>
</del><ins>+ <div class="firstRowFirstColumn percentWidth" data-expected-width="50" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn percentHeight" data-expected-width="15" data-expected-height="300"></div>
+ <div class="secondRowFirstColumn percentHeightAndWidth" data-expected-width="150" data-expected-height="100"></div>
+ <div class="secondRowSecondColumn percentHeightAndWidth" data-expected-width="150" data-expected-height="300"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="percentHeight verticalRL" data-expected-width="15" data-expected-height="50"></div>
- <div id="c" class="percentHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="percentHeightAndWidth verticalRL" data-expected-width="300" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn percentWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn percentHeight verticalRL" data-expected-width="15" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn percentHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn percentHeightAndWidth verticalRL" data-expected-width="300" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="grid">
</span><del>- <div id="a" class="percentWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
- <div id="b" class="percentHeight" data-expected-width="15" data-expected-height="50"></div>
- <div id="c" class="percentHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
- <div id="d" class="percentHeightAndWidth" data-expected-width="300" data-expected-height="150"></div>
</del><ins>+ <div class="firstRowFirstColumn percentWidth verticalRL" data-expected-width="100" data-expected-height="15"></div>
+ <div class="firstRowSecondColumn percentHeight" data-expected-width="15" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn percentHeightAndWidth verticalRL" data-expected-width="100" data-expected-height="150"></div>
+ <div class="secondRowSecondColumn percentHeightAndWidth" data-expected-width="300" data-expected-height="150"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutplacecellbyindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html (140479 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html 2013-01-22 23:28:02 UTC (rev 140479)
+++ trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -4,40 +4,30 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
</span><span class="cx"> </script>
</span><ins>+<link href="resources/grid.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- display: -webkit-grid;
</del><span class="cx"> -webkit-grid-columns: 50px 60px;
</span><span class="cx"> -webkit-grid-rows: 20px 30px;
</span><del>- background-color: grey;
</del><span class="cx"> max-width: 110px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#a {
- background-color: blue;
- -webkit-grid-column: 1;
- -webkit-grid-row: 1;
</del><ins>+.firstRowFirstColumn {
</ins><span class="cx"> width: 10px;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#b {
- background-color: green;
- -webkit-grid-column: 2;
- -webkit-grid-row: 1;
</del><ins>+
+.firstRowSecondColumn {
</ins><span class="cx"> width: 10px;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#c {
- background-color: red;
- -webkit-grid-column: 1;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowFirstColumn {
</ins><span class="cx"> width: 10px;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><del>-#d {
- background-color: orange;
- -webkit-grid-column: 2;
- -webkit-grid-row: 2;
</del><ins>+
+.secondRowSecondColumn {
</ins><span class="cx"> width: 10px;
</span><span class="cx"> height: 15px;
</span><span class="cx"> }
</span><span class="lines">@@ -51,37 +41,37 @@
</span><span class="cx"> them once we properly implement stretching / alignment. -->
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" data-expected-width="110" data-expected-height="50">
</span><del>- <div id="a" data-offset-x="0" data-offset-y="0"></div>
- <div id="b" data-offset-x="50" data-offset-y="0"></div>
- <div id="c" data-offset-x="0" data-offset-y="20"></div>
- <div id="d" data-offset-x="50" data-offset-y="20"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0"></div>
+ <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="0"></div>
+ <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="20"></div>
+ <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="20"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: horizontal-bt" data-expected-width="110" data-expected-height="50">
</span><del>- <div id="a" data-offset-x="0" data-offset-y="35"></div>
- <div id="b" data-offset-x="50" data-offset-y="35"></div>
- <div id="c" data-offset-x="0" data-offset-y="15"></div>
- <div id="d" data-offset-x="50" data-offset-y="15"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="35"></div>
+ <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="35"></div>
+ <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="15"></div>
+ <div class="secondRowSecondColumn" data-offset-x="50" data-offset-y="15"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-rl; margin-bottom: 60px;" data-expected-width="50" data-expected-height="110">
</span><del>- <div id="a" data-offset-x="40" data-offset-y="0"></div>
- <div id="b" data-offset-x="40" data-offset-y="50"></div>
- <div id="c" data-offset-x="20" data-offset-y="0"></div>
- <div id="d" data-offset-x="20" data-offset-y="50"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-offset-x="40" data-offset-y="0"></div>
+ <div class="firstRowSecondColumn" data-offset-x="40" data-offset-y="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="20" data-offset-y="0"></div>
+ <div class="secondRowSecondColumn" data-offset-x="20" data-offset-y="50"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid" style="-webkit-writing-mode: vertical-lr; margin-bottom: 60px;" data-expected-width="50" data-expected-height="110">
</span><del>- <div id="a" data-offset-x="0" data-offset-y="0"></div>
- <div id="b" data-offset-x="0" data-offset-y="50"></div>
- <div id="c" data-offset-x="20" data-offset-y="0"></div>
- <div id="d" data-offset-x="20" data-offset-y="50"></div>
</del><ins>+ <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0"></div>
+ <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="20" data-offset-y="0"></div>
+ <div class="secondRowSecondColumn" data-offset-x="20" data-offset-y="50"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcss"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/resources/grid.css (0 => 140480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid.css (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid.css 2013-01-22 23:33:18 UTC (rev 140480)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+.grid {
+ display: -webkit-grid;
+ background-color: grey;
+}
+
+.inline-grid {
+ display: -webkit-inline-grid;
+ background-color: grey;
+}
+
+.firstRowFirstColumn {
+ background-color: blue;
+ -webkit-grid-column: 1;
+ -webkit-grid-row: 1;
+}
+
+.firstRowSecondColumn {
+ background-color: lime;
+ -webkit-grid-column: 2;
+ -webkit-grid-row: 1;
+}
+
+.secondRowFirstColumn {
+ background-color: purple;
+ -webkit-grid-column: 1;
+ -webkit-grid-row: 2;
+}
+
+.secondRowSecondColumn {
+ background-color: orange;
+ -webkit-grid-column: 2;
+ -webkit-grid-row: 2;
+}
+
+.verticalRL {
+ -webkit-writing-mode: vertical-rl;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>