<!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>[184446] 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/184446">184446</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-17 23:16:58 -0700 (Sun, 17 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Add scrollbar width in intrinsic logical widths computation
https://bugs.webkit.org/show_bug.cgi?id=145021
Source/WebCore:
Like for flexboxes we've to take into account the scrollbar logical
width while computing the intrinsic min and max logical widths.
Reviewed by Sergio Villar Senin.
Test: fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeIntrinsicLogicalWidths): Add scrollbar
logical width.
LayoutTests:
Reviewed by Sergio Villar Senin.
* fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt: Added.
* fast/css-grid-layout/compute-intrinsic-widths-scrollbar.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="#trunkLayoutTestsfastcssgridlayoutcomputeintrinsicwidthsscrollbarexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutcomputeintrinsicwidthsscrollbarhtml">trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184445 => 184446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-18 03:39:28 UTC (rev 184445)
+++ trunk/LayoutTests/ChangeLog 2015-05-18 06:16:58 UTC (rev 184446)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-17 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Add scrollbar width in intrinsic logical widths computation
+ https://bugs.webkit.org/show_bug.cgi?id=145021
+
+ Reviewed by Sergio Villar Senin.
+
+ * fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt: Added.
+ * fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html: Added.
+
</ins><span class="cx"> 2015-05-16 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Subpixel): Dashed underline is missing when box is positioned at subpixels.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutcomputeintrinsicwidthsscrollbarexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt (0 => 184446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar-expected.txt 2015-05-18 06:16:58 UTC (rev 184446)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+This test checks that grid container scrollbar is computed properly during intrinsic width calculation.
+
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
+item
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutcomputeintrinsicwidthsscrollbarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html (0 => 184446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html 2015-05-18 06:16:58 UTC (rev 184446)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<link href="resources/grid.css" rel="stylesheet">
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
+<style>
+ .grid {
+ overflow-y: scroll;
+ }
+
+ .item {
+ width: 200px;
+ }
+
+ .oneColumn {
+ -webkit-grid-template-columns: 200px;
+ }
+
+ .fourColumns {
+ -webkit-grid-template-columns: repeat(4, 50px);
+ }
+</style>
+<script src="../../resources/check-layout.js"></script>
+<p>This test checks that grid container scrollbar is computed properly during intrinsic width calculation.</p>
+<body onload="checkLayout('.grid')">
+ <div class="grid min-content" data-expected-client-width="200">
+ <div class="item">item</div>
+ </div>
+ <div class="grid max-content" data-expected-client-width="200">
+ <div class="item">item</div>
+ </div>
+ <div class="grid fit-content" data-expected-client-width="200">
+ <div class="item">item</div>
+ </div>
+ <div class="grid oneColumn min-content" data-expected-client-width="200">
+ item
+ </div>
+ <div class="grid oneColumn max-content" data-expected-client-width="200">
+ item
+ </div>
+ <div class="grid oneColumn fit-content" data-expected-client-width="200">
+ item
+ </div>
+ <div class="grid fourColumns min-content" data-expected-client-width="200">
+ item
+ </div>
+ <div class="grid fourColumns max-content" data-expected-client-width="200">
+ item
+ </div>
+ <div class="grid fourColumns fit-content" data-expected-client-width="200">
+ item
+ </div>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184445 => 184446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-18 03:39:28 UTC (rev 184445)
+++ trunk/Source/WebCore/ChangeLog 2015-05-18 06:16:58 UTC (rev 184446)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-17 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Add scrollbar width in intrinsic logical widths computation
+ https://bugs.webkit.org/show_bug.cgi?id=145021
+
+ Like for flexboxes we've to take into account the scrollbar logical
+ width while computing the intrinsic min and max logical widths.
+
+ Reviewed by Sergio Villar Senin.
+
+ Test: fast/css-grid-layout/compute-intrinsic-widths-scrollbar.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeIntrinsicLogicalWidths): Add scrollbar
+ logical width.
+
</ins><span class="cx"> 2015-05-17 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Delegate ReadableStreamReader reference counting to ReadableStream
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (184445 => 184446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-05-18 03:39:28 UTC (rev 184445)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-05-18 06:16:58 UTC (rev 184446)
</span><span class="lines">@@ -301,10 +301,12 @@
</span><span class="cx">
</span><span class="cx"> minLogicalWidth += minTrackBreadth;
</span><span class="cx"> maxLogicalWidth += maxTrackBreadth;
</span><del>-
- // FIXME: This should add in the scrollbarWidth (e.g. see RenderFlexibleBox).
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
+ minLogicalWidth += scrollbarWidth;
+ maxLogicalWidth += scrollbarWidth;
+
</ins><span class="cx"> if (!wasPopulated)
</span><span class="cx"> const_cast<RenderGrid*>(this)->clearGrid();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>