<!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>[166717] 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/166717">166717</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-03 07:50:55 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Make sure grid element's shrink-to-fit behavior is correct
https://bugs.webkit.org/show_bug.cgi?id=103473
Patch by Javier Fernandez <jfernandez@igalia.com> on 2014-04-03
Reviewed by Sergio Villar Senin.
Added a new Layout Test to verify the shrink-to-fit behavior works as expected
for out-of-flow positioned grid elements.
* fast/css-grid-layout/grid-element-shrink-to-fit-expected.html: Added.
* fast/css-grid-layout/grid-element-shrink-to-fit.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementshrinktofitexpectedhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementshrinktofithtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166716 => 166717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-03 14:37:32 UTC (rev 166716)
+++ trunk/LayoutTests/ChangeLog        2014-04-03 14:50:55 UTC (rev 166717)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-03 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Grid Layout] Make sure grid element's shrink-to-fit behavior is correct
+ https://bugs.webkit.org/show_bug.cgi?id=103473
+
+ Reviewed by Sergio Villar Senin.
+
+ Added a new Layout Test to verify the shrink-to-fit behavior works as expected
+ for out-of-flow positioned grid elements.
+
+ * fast/css-grid-layout/grid-element-shrink-to-fit-expected.html: Added.
+ * fast/css-grid-layout/grid-element-shrink-to-fit.html: Added.
+
</ins><span class="cx"> 2014-03-27 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] <string> not allowed in grid-{area | row | column} syntax
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementshrinktofitexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit-expected.html (0 => 166717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit-expected.html        2014-04-03 14:50:55 UTC (rev 166717)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<style>
+.grid {
+ background-color: grey;
+}
+
+.regularGrid {
+ height: 100px;
+}
+
+.outOfFlowGrid {
+ width: 200px;
+ height: 100px;
+}
+
+.firstRowFirstColumn {
+ position: absolute;
+ background-color: blue;
+ width: 100px;
+ height: 40px;
+ top: 0px;
+}
+
+.firstRowSecondColumn {
+ position: absolute;
+ background-color: lime;
+ width: 50px;
+ height: 40px;
+ left: 50%;
+}
+
+.secondRowFirstColumn {
+ position: absolute;
+ background-color: purple;
+ width: 40px;
+ height: 40px;
+ top: 50px;
+}
+
+.secondRowSecondColumn {
+ position: absolute;
+ background-color: orange;
+ width: 30px;
+ height: 40px;
+ top: 50px;
+ left: 50%;
+}
+
+.testContainer {
+ position: relative;
+}
+</style>
+<body>
+
+<p>This test checks that the shrink-to-fit behavior is applied to out-of-flow positioned elements.</p>
+
+<div class="testContainer">
+ <div class="grid regularGrid">
+ <div class="firstRowFirstColumn"></div>
+ <div class="firstRowSecondColumn"></div>
+ <div class="secondRowFirstColumn"></div>
+ <div class="secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer" style="width: 200px;">
+ <div class="grid outOfFlowGrid">
+ <div class="one firstRowFirstColumn"></div>
+ <div class="two firstRowSecondColumn"></div>
+ <div class="three secondRowFirstColumn"></div>
+ <div class="four secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer" style="width: 200px;">
+ <div class="grid outOfFlowGrid">
+ <div class="firstRowFirstColumn"></div>
+ <div class="firstRowSecondColumn"></div>
+ <div class="secondRowFirstColumn"></div>
+ <div class="secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer" style="width: 200px;">
+ <div class="grid outOfFlowGrid">
+ <div class="firstRowFirstColumn"></div>
+ <div class="firstRowSecondColumn"></div>
+ <div class="secondRowFirstColumn"></div>
+ <div class="secondRowSecondColumn"></div>
+ </div>
+</div>
+
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementshrinktofithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html (0 => 166717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html         (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html        2014-04-03 14:50:55 UTC (rev 166717)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script>
+if (window.testRunner)
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
+</script>
+<link href="resources/grid.css" rel="stylesheet">
+<style>
+.grid {
+ -webkit-grid-template-rows: 50px 50px;
+ -webkit-grid-template-columns: 0.5fr 0.5fr;
+}
+
+.floatPos {
+ float: left;
+}
+
+.absolutePos {
+ position: absolute;
+}
+
+.fixedPos {
+ position: fixed;
+}
+
+.one {
+ width: 100px;
+ height: 40px;
+}
+
+.two {
+ width: 50px;
+ height: 40px;
+}
+.three {
+ width: 40px;
+ height: 40px;
+}
+.four {
+ width: 30px;
+ height: 40px;
+}
+
+.testContainer {
+ position: relative;
+ height: 100px;
+}
+</style>
+<body>
+
+<p>This test checks that the shrink-to-fit behavior is applied to out-of-flow positioned elements.</p>
+
+<div class="testContainer">
+ <div class="grid">
+ <div class="one firstRowFirstColumn"></div>
+ <div class="two firstRowSecondColumn"></div>
+ <div class="three secondRowFirstColumn"></div>
+ <div class="four secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid floatPos">
+ <div class="one firstRowFirstColumn"></div>
+ <div class="two firstRowSecondColumn"></div>
+ <div class="three secondRowFirstColumn"></div>
+ <div class="four secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid absolutePos">
+ <div class="one firstRowFirstColumn"></div>
+ <div class="two firstRowSecondColumn"></div>
+ <div class="three secondRowFirstColumn"></div>
+ <div class="four secondRowSecondColumn"></div>
+ </div>
+</div>
+
+<div class="testContainer">
+ <div class="grid fixedPos">
+ <div class="one firstRowFirstColumn"></div>
+ <div class="two firstRowSecondColumn"></div>
+ <div class="three secondRowFirstColumn"></div>
+ <div class="four secondRowSecondColumn"></div>
+ </div>
+</div>
+
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>