<!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>[192512] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192512">192512</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-17 02:11:43 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Fix alignment with gutters and negative free spaces
https://bugs.webkit.org/show_bug.cgi?id=151307
Reviewed by Zalan Bujtas.
Source/WebCore:
This is a regression caused by <a href="http://trac.webkit.org/projects/webkit/changeset/192154">r192154</a>. The problem was that
the free space was not properly computed when the grid
container was narrower than the track sizes + gutters size for
a given axis. The culprit was an unneeded clamp to 0 which was
polluting the freeSpace computation as the track sizing
algorithm works perfectly OK with negative freeSpace values.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeTrackSizesForDirection):
LayoutTests:
* fast/css-grid-layout/grid-gutters-and-alignment-expected.txt:
* fast/css-grid-layout/grid-gutters-and-alignment.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandalignmentexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandalignmenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192511 => 192512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-17 09:57:42 UTC (rev 192511)
+++ trunk/LayoutTests/ChangeLog 2015-11-17 10:11:43 UTC (rev 192512)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-17 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Fix alignment with gutters and negative free spaces
+ https://bugs.webkit.org/show_bug.cgi?id=151307
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/css-grid-layout/grid-gutters-and-alignment-expected.txt:
+ * fast/css-grid-layout/grid-gutters-and-alignment.html:
+
</ins><span class="cx"> 2015-11-17 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL Gardening on 16th Nov.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment-expected.txt (192511 => 192512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment-expected.txt 2015-11-17 09:57:42 UTC (rev 192511)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment-expected.txt 2015-11-17 10:11:43 UTC (rev 192512)
</span><span class="lines">@@ -56,3 +56,21 @@
</span><span class="cx"> direction: RTL (parall) | align-items: 'self-start' | justify-items: 'self-start'
</span><span class="cx">
</span><span class="cx"> PASS
</span><ins>+Negative free space. justify-content: start
+
+PASS
+Negative free space. justify-content: center
+
+PASS
+Negative free space. justify-content: end
+
+PASS
+Negative free space. align-content: start
+
+PASS
+Negative free space. align-content: center
+
+PASS
+Negative free space. align-content: end
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandalignmenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html (192511 => 192512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html 2015-11-17 09:57:42 UTC (rev 192511)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-alignment.html 2015-11-17 10:11:43 UTC (rev 192512)
</span><span class="lines">@@ -40,6 +40,22 @@
</span><span class="cx"> position: relative; /* For the <p> comments */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.gridWithAutoColumns {
+ grid-auto-columns: 20px;
+ border: 2px solid black;
+ width: 10px;
+ margin-left: 200px;
+ position: relative;
+}
+
+.gridWithAutoRows {
+ -webkit-grid-auto-rows: 40px;
+ border: 2px solid black;
+ height: 50px;
+ width: 20px;
+ position: relative;
+}
+
</ins><span class="cx"> .stretch {
</span><span class="cx"> align-self: stretch;
</span><span class="cx"> justify-self: stretch;
</span><span class="lines">@@ -63,6 +79,11 @@
</span><span class="cx"> margin: 4px 8px 12px 16px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.thirdRowFirstColumn {
+ background-color: lime;
+ grid-row: 3;
+ grid-column: 1;
+}
</ins><span class="cx">
</span><span class="cx"> .container {
</span><span class="cx"> position: relative;
</span><span class="lines">@@ -294,4 +315,60 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<!-- Check behavior with negative free space -->
+<div class="container">
+ <p>Negative free space. justify-content: start</p>
+ <div class="grid gridWithAutoColumns justifyContentStart gridRowColumnGaps" data-expected-width="14" data-expected-height="44">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowSecondColumn" data-offset-x="41" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowThirdColumn" data-offset-x="82" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div class="container">
+ <p>Negative free space. justify-content: center</p>
+ <div class="grid gridWithAutoColumns justifyContentCenter gridRowColumnGaps" data-expected-width="14" data-expected-height="44">
+ <div class="cell firstRowFirstColumn" data-offset-x="-46" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowSecondColumn" data-offset-x="-5" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowThirdColumn" data-offset-x="36" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div class="container">
+ <p>Negative free space. justify-content: end</p>
+ <div class="grid gridWithAutoColumns justifyContentEnd gridRowColumnGaps" data-expected-width="14" data-expected-height="44">
+ <div class="cell firstRowFirstColumn" data-offset-x="-92" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowSecondColumn" data-offset-x="-51" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell firstRowThirdColumn" data-offset-x="-10" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<!-- NOTE: for the following 3 test cases we use margins just for enhancing the visual output (otherwise grids would overlap) -->
+<div class="container" style="margin-bottom: 125px;">
+ <p>Negative free space. align-content: start</p>
+ <div class="grid gridWithAutoRows alignContentStart gridRowColumnGaps" data-expected-width="24" data-expected-height="54">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell secondRowFirstColumn" data-offset-x="0" data-offset-y="57" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell thirdRowFirstColumn" data-offset-x="0" data-offset-y="114" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div class="container" style="margin-bottom: 75px;">
+ <p>Negative free space. align-content: center</p>
+ <div class="grid gridWithAutoRows alignContentCenter gridRowColumnGaps" style="margin-top: 75px" data-expected-width="24" data-expected-height="54">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="-52" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell secondRowFirstColumn" data-offset-x="0" data-offset-y="5" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell thirdRowFirstColumn" data-offset-x="0" data-offset-y="62" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div class="container" style="margin-bottom: 25px;">
+ <p>Negative free space. align-content: end</p>
+ <div class="grid gridWithAutoRows alignContentEnd gridRowColumnGaps" style="margin-top: 125px" data-expected-width="24" data-expected-height="54">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="-104" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell secondRowFirstColumn" data-offset-x="0" data-offset-y="-47" data-expected-width="20" data-expected-height="40"></div>
+ <div class="cell thirdRowFirstColumn" data-offset-x="0" data-offset-y="10" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
</ins><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192511 => 192512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-17 09:57:42 UTC (rev 192511)
+++ trunk/Source/WebCore/ChangeLog 2015-11-17 10:11:43 UTC (rev 192512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-11-17 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Fix alignment with gutters and negative free spaces
+ https://bugs.webkit.org/show_bug.cgi?id=151307
+
+ Reviewed by Zalan Bujtas.
+
+ This is a regression caused by r192154. The problem was that
+ the free space was not properly computed when the grid
+ container was narrower than the track sizes + gutters size for
+ a given axis. The culprit was an unneeded clamp to 0 which was
+ polluting the freeSpace computation as the track sizing
+ algorithm works perfectly OK with negative freeSpace values.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeTrackSizesForDirection):
+
</ins><span class="cx"> 2015-11-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Use RunLoop instead of GMainLoop in AudioFileReaderGStreamer
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (192511 => 192512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-11-17 09:57:42 UTC (rev 192511)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-11-17 10:11:43 UTC (rev 192512)
</span><span class="lines">@@ -316,8 +316,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(freeSpace >= 0);
</span><span class="cx"> LayoutUnit totalGuttersSize = guttersSize(direction, direction == ForRows ? gridRowCount() : gridColumnCount());
</span><del>- freeSpace = std::max<LayoutUnit>(0, freeSpace - totalGuttersSize);
- sizingData.setFreeSpaceForDirection(direction, freeSpace);
</del><ins>+ sizingData.setFreeSpaceForDirection(direction, freeSpace - totalGuttersSize);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit baseSizes, growthLimits;
</span><span class="cx"> computeUsedBreadthOfGridTracks(direction, sizingData, baseSizes, growthLimits);
</span></span></pre>
</div>
</div>
</body>
</html>