<!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>[193000] 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/193000">193000</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-03 09:57:13 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] margin-left:auto and margin-top:auto discards the margin on opposite side
https://bugs.webkit.org/show_bug.cgi?id=151802
Reviewed by Sergio Villar Senin.
Source/WebCore:
When resolving auto margins so that they use the available space, in the
corresponding axis, we must consider that there might be other specified
margins. Such margins must account to determine the actual available space.
Test: fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::updateAutoMarginsInRowAxisIfNeeded):
(WebCore::RenderGrid::updateAutoMarginsInColumnAxisIfNeeded):
LayoutTests:
Tests to verify the specified margins account for determining the available space for
auto-margins alignment.
* fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt: Added.
* fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginsexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginshtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192999 => 193000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-03 17:08:37 UTC (rev 192999)
+++ trunk/LayoutTests/ChangeLog 2015-12-03 17:57:13 UTC (rev 193000)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-03 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-grid] margin-left:auto and margin-top:auto discards the margin on opposite side
+ https://bugs.webkit.org/show_bug.cgi?id=151802
+
+ Reviewed by Sergio Villar Senin.
+
+ Tests to verify the specified margins account for determining the available space for
+ auto-margins alignment.
+
+ * fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt: Added.
+ * fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html: Added.
+
</ins><span class="cx"> 2015-12-03 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaselining svg/custom/bug78807.svg since actual results now match Mac expectations
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt (0 => 193000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins-expected.txt 2015-12-03 17:57:13 UTC (rev 193000)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+This test checks auto-margins alignment respects the specified margins.
+
+margin: 5px 7px 11px 13px | margin-left: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin-right: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin-left: auto and margin-right: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin-top: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin-bottom: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin-bottom: auto and margin-top: auto
+
+PASS
+margin: 5px 7px 11px 13px | margin: auto
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html (0 => 193000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html 2015-12-03 17:57:13 UTC (rev 193000)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<link href="resources/grid.css" rel="stylesheet">
+<link href="resources/grid-alignment.css" rel="stylesheet">
+<script src="../../resources/check-layout.js"></script>
+<style>
+body {
+ margin: 0;
+}
+
+.grid {
+ -webkit-grid-template-columns: 100px;
+ -webkit-grid-template-rows: 100px;
+ width: -webkit-fit-content;
+ position: relative;
+}
+
+.item {
+ width: 20px;
+ height: 40px;
+ margin: 5px 7px 11px 13px;
+ background-color: lime;
+ grid-column: 1;
+ grid-row: 1;
+}
+
+.autoMarginTop { margin-top: auto; }
+.autoMarginRight { margin-right: auto; }
+.autoMarginBottom { margin-bottom: auto; }
+.autoMarginLeft { margin-left: auto; }
+.autoMargin { margin: auto; }
+</style>
+<body onload="checkLayout('.grid')">
+<div id=log></div>
+
+<p>This test checks auto-margins alignment respects the specified margins.</p>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-left: auto</b> </p>
+<div class="grid">
+ <div class="item autoMarginLeft" data-offset-x="73" data-offset-y="5"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-right: auto</b> </p>
+<div class="grid">
+ <div class="item autoMarginRight" data-offset-x="13" data-offset-y="5"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-left: auto</b> and <b>margin-right: auto</b></p>
+<div class="grid">
+ <div class="item autoMarginLeft autoMarginRight" data-offset-x="40" data-offset-y="5"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-top: auto</b> </p>
+<div class="grid">
+ <div class="item autoMarginTop" data-offset-x="13" data-offset-y="49"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-bottom: auto</b> </p>
+<div class="grid">
+ <div class="item autoMarginBottom" data-offset-x="13" data-offset-y="5"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin-bottom: auto</b> and <b>margin-top: auto</b></p>
+<div class="grid">
+ <div class="item autoMarginTop autoMarginBottom" data-offset-x="13" data-offset-y="30"></div>
+</div>
+
+<p>margin: 5px 7px 11px 13px | <b>margin: auto</b></p>
+<div class="grid">
+ <div class="item autoMargin" data-offset-x="40" data-offset-y="30"></div>
+</div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192999 => 193000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-03 17:08:37 UTC (rev 192999)
+++ trunk/Source/WebCore/ChangeLog 2015-12-03 17:57:13 UTC (rev 193000)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-03 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-grid] margin-left:auto and margin-top:auto discards the margin on opposite side
+ https://bugs.webkit.org/show_bug.cgi?id=151802
+
+ Reviewed by Sergio Villar Senin.
+
+ When resolving auto margins so that they use the available space, in the
+ corresponding axis, we must consider that there might be other specified
+ margins. Such margins must account to determine the actual available space.
+
+ Test: fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::updateAutoMarginsInRowAxisIfNeeded):
+ (WebCore::RenderGrid::updateAutoMarginsInColumnAxisIfNeeded):
+
</ins><span class="cx"> 2015-12-02 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ResourceLoadScheduler to WebKit1
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (192999 => 193000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-12-03 17:08:37 UTC (rev 192999)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-12-03 17:57:13 UTC (rev 193000)
</span><span class="lines">@@ -1688,7 +1688,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!child.isOutOfFlowPositioned());
</span><span class="cx">
</span><del>- LayoutUnit availableAlignmentSpace = child.overrideContainingBlockContentLogicalWidth().value() - child.logicalWidth();
</del><ins>+ LayoutUnit availableAlignmentSpace = child.overrideContainingBlockContentLogicalWidth().value() - child.logicalWidth() - child.marginLogicalWidth();
</ins><span class="cx"> if (availableAlignmentSpace <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1710,7 +1710,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!child.isOutOfFlowPositioned());
</span><span class="cx">
</span><del>- LayoutUnit availableAlignmentSpace = child.overrideContainingBlockContentLogicalHeight().value() - child.logicalHeight();
</del><ins>+ LayoutUnit availableAlignmentSpace = child.overrideContainingBlockContentLogicalHeight().value() - child.logicalHeight() - child.marginLogicalHeight();
</ins><span class="cx"> if (availableAlignmentSpace <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>