<!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>[189538] 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/189538">189538</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-09-09 04:23:07 -0700 (Wed, 09 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Percentage columns shouldn't include border and padding
https://bugs.webkit.org/show_bug.cgi?id=148978
Reviewed by Sergio Villar Senin.
Source/WebCore:
Subtract border and padding when we're calculating the breadth of the
columns in LayoutGrid::computeUsedBreadthOfSpecifiedLength().
Added test to check the behavior for both columns and rows.
Test: fast/css-grid-layout/grid-percent-track-margin-border-padding.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeUsedBreadthOfSpecifiedLength):
LayoutTests:
* fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt: Added.
* fast/css-grid-layout/grid-percent-track-margin-border-padding.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="#trunkLayoutTestsfastcssgridlayoutgridpercenttrackmarginborderpaddingexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpercenttrackmarginborderpaddinghtml">trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189537 => 189538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-09 08:49:19 UTC (rev 189537)
+++ trunk/LayoutTests/ChangeLog 2015-09-09 11:23:07 UTC (rev 189538)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-09 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Percentage columns shouldn't include border and padding
+ https://bugs.webkit.org/show_bug.cgi?id=148978
+
+ Reviewed by Sergio Villar Senin.
+
+ * fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt: Added.
+ * fast/css-grid-layout/grid-percent-track-margin-border-padding.html: Added.
+
</ins><span class="cx"> 2015-09-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLTableElement.tHead / tFoot / caption should be nullable
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpercenttrackmarginborderpaddingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt (0 => 189538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt 2015-09-09 11:23:07 UTC (rev 189538)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This test checks that percentage tracks ignore grid container's margin, border and padding in order to calculate their breadths.
+
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpercenttrackmarginborderpaddinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html (0 => 189538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html 2015-09-09 11:23:07 UTC (rev 189538)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<link href="resources/grid.css" rel="stylesheet">
+<style>
+.grid {
+ width: 100px;
+ height: 100px;
+ -webkit-grid-template-columns: 20% 50% 30%;
+ -webkit-grid-template-rows: 40% 60%;
+}
+
+.margin {
+ margin: 10px;
+}
+
+.border {
+ border: 5px solid black;
+}
+
+.padding {
+ padding: 20px;
+}
+</style>
+<script src="../../resources/check-layout.js"></script>
+</head>
+<body onload="checkLayout('.grid');">
+ <p>This test checks that percentage tracks ignore grid container's margin, border and padding in order to calculate their breadths.</p>
+
+ <div class="grid">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid margin">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid border">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid padding">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid margin border">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid margin padding">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid border padding">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+
+ <div class="grid margin border padding">
+ <div data-expected-width="20" data-expected-height="40"></div>
+ <div data-expected-width="50" data-expected-height="40"></div>
+ <div data-expected-width="30" data-expected-height="40"></div>
+ <div data-expected-width="20" data-expected-height="60"></div>
+ <div data-expected-width="50" data-expected-height="60"></div>
+ <div data-expected-width="30" data-expected-height="60"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189537 => 189538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-09 08:49:19 UTC (rev 189537)
+++ trunk/Source/WebCore/ChangeLog 2015-09-09 11:23:07 UTC (rev 189538)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-09 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Percentage columns shouldn't include border and padding
+ https://bugs.webkit.org/show_bug.cgi?id=148978
+
+ Reviewed by Sergio Villar Senin.
+
+ Subtract border and padding when we're calculating the breadth of the
+ columns in LayoutGrid::computeUsedBreadthOfSpecifiedLength().
+
+ Added test to check the behavior for both columns and rows.
+
+ Test: fast/css-grid-layout/grid-percent-track-margin-border-padding.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeUsedBreadthOfSpecifiedLength):
+
</ins><span class="cx"> 2015-09-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLTableElement.tHead / tFoot / caption should be nullable
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (189537 => 189538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-09 08:49:19 UTC (rev 189537)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-09 11:23:07 UTC (rev 189538)
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(trackLength.isSpecified());
</span><span class="cx"> if (direction == ForColumns)
</span><del>- return valueForLength(trackLength, logicalWidth());
</del><ins>+ return valueForLength(trackLength, logicalWidth() - borderAndPaddingLogicalWidth());
</ins><span class="cx"> return valueForLength(trackLength, computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt).valueOr(0));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>