<!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>[195131] releases/WebKitGTK/webkit-2.10</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/195131">195131</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 05:41:51 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194143">r194143</a> - Fix computation of min|max-content contribution of non-replaced blocks
https://bugs.webkit.org/show_bug.cgi?id=152004
Reviewed by Darin Adler.
Source/WebCore:
WebKit currently always returns the min preferred logical
width for the min-content contribution (and the max preferred
logical width for the max-content contribution) for
non-replaced blocks. That is not correct according to specs
https://drafts.csswg.org/css-sizing/#block-intrinsic.
The min-content and max-content contributions actually depend
on the computed inline size of the block:
* for min-content,max-content or definite sizes: min-content
and max-content contributions are the inline size plus border,
margin and padding.
* otherwise: min-content contribution is the min-content size
and max-content contribution is the max-content size (in both
cases plus border, padding and margin).
Tests: fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html
fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html
fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
LayoutTests:
* fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html: Added.
* fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html: Added.
* fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html: Added.
* fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html: Added.
* fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
* fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
* fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css: Added.
(.container):
(.item):
(.border):
(.padding):
(.margin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks1expectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks1html">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks2expectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks2html">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmaxcontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmincontentinlinesizecontributionnonreplacedblockshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsresourcesintrinsicsizecontributioncss">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195130 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 13:23:16 UTC (rev 195130)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-12-08 Sergio Villar Senin <svillar@igalia.com>
+
+ Fix computation of min|max-content contribution of non-replaced blocks
+ https://bugs.webkit.org/show_bug.cgi?id=152004
+
+ Reviewed by Darin Adler.
+
+ * fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html: Added.
+ * fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html: Added.
+ * fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html: Added.
+ * fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html: Added.
+ * fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html: Added.
+ * fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css: Added.
+ (.container):
+ (.item):
+ (.border):
+ (.padding):
+ (.margin):
+
</ins><span class="cx"> 2015-12-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up absolute positioned map properly.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container max-content">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsautomincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container min-content">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container max-content">
+ <div class="item fill-available">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fill-available border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfillavailablemincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container min-content">
+ <div class="item fill-available">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fill-available border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container max-content">
+ <div class="item fit-content">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item fit-content border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfitcontentmincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container min-content">
+ <div class="item fit-content">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item fit-content border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks1expectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.fixed {
+ width: 50px;
+}
+</style>
+
+<div class="container max-content">
+ <div class="item fixed"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed border"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed padding"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed margin"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed border padding"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed border margin"></div>
+</div>
+
+<div class="container max-content">
+ <div class="item fixed border padding margin"></div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks1html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.fixed {
+ width: 50px;
+}
+</style>
+
+<div class="container min-content">
+ <div class="item fixed"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed border"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed padding"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed margin"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed border padding"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed border margin"></div>
+</div>
+
+<div class="container min-content">
+ <div class="item fixed border padding margin"></div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks2expectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.percent {
+ width: 50%;
+}
+</style>
+
+<div class="container max-content">
+ <div style="width: 50px;">
+ <div class="item percent"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 60px;">
+ <div class="item percent border"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 70px;">
+ <div class="item percent padding"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 90px;">
+ <div class="item percent margin"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 80px;">
+ <div class="item percent border padding"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 100px;">
+ <div class="item percent border margin"></div>
+ </div>
+</div>
+
+<div class="container max-content">
+ <div style="width: 120px;">
+ <div class="item percent border padding margin"></div>
+ </div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsfixedinlinesizecontributionnonreplacedblocks2html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.percent {
+ width: 50%;
+}
+</style>
+
+<div class="container min-content">
+ <div style="width: 50px;">
+ <div class="item percent"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 60px;">
+ <div class="item percent border"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 70px;">
+ <div class="item percent padding"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 90px;">
+ <div class="item percent margin"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 80px;">
+ <div class="item percent border padding"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 100px;">
+ <div class="item percent border margin"></div>
+ </div>
+</div>
+
+<div class="container min-content">
+ <div style="width: 120px;">
+ <div class="item percent border padding margin"></div>
+ </div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.item {
+ width: 50%;
+}
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.item {
+ width: 50%;
+}
+</style>
+<div class="container max-content">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.item {
+ width: 50%;
+}
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsindefinitepercentmincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+
+.item {
+ width: 50%;
+}
+</style>
+
+<div class="container min-content">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container max-content">
+ <div class="item max-content">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item max-content border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 90px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 110px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 130px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 140px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 160px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmaxcontentmincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container min-content">
+ <div class="item max-content">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item max-content border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmaxcontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmaxcontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container max-content">
+ <div class="item min-content">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content border">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container max-content">
+ <div class="item min-content border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmincontentinlinesizecontributionnonreplacedblocksexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks-expected.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container" style="width: 50px;">
+ <div class="item">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 60px;">
+ <div class="item border">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 70px;">
+ <div class="item padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 90px;">
+ <div class="item margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 80px;">
+ <div class="item border padding">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 100px;">
+ <div class="item border margin">XXX XXXXX</div>
+</div>
+
+<div class="container" style="width: 120px;">
+ <div class="item border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsmincontentmincontentinlinesizecontributionnonreplacedblockshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<style>
+@import "resources/width-keyword-classes.css";
+@import "resources/intrinsic-size-contribution.css";
+</style>
+
+<div class="container min-content">
+ <div class="item min-content">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content border">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content border padding">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content border margin">XXX XXXXX</div>
+</div>
+
+<div class="container min-content">
+ <div class="item min-content border padding margin">XXX XXXXX</div>
+</div>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastcssintrinsicdimensionsresourcesintrinsicsizecontributioncss"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css (0 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/css-intrinsic-dimensions/resources/intrinsic-size-contribution.css 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+.container {
+ border: 5px solid blue;
+ background-color: gray;
+ margin-top: 10px;
+}
+
+.item {
+ font: 10px/1 Ahem;
+ height: 30px;
+ background-color: orange;
+}
+
+.border { border: 5px solid red; }
+
+.padding { padding: 10px; }
+
+.margin { margin: 20px; }
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195130 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 13:23:16 UTC (rev 195130)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-12-08 Sergio Villar Senin <svillar@igalia.com>
+
+ Fix computation of min|max-content contribution of non-replaced blocks
+ https://bugs.webkit.org/show_bug.cgi?id=152004
+
+ Reviewed by Darin Adler.
+
+ WebKit currently always returns the min preferred logical
+ width for the min-content contribution (and the max preferred
+ logical width for the max-content contribution) for
+ non-replaced blocks. That is not correct according to specs
+ https://drafts.csswg.org/css-sizing/#block-intrinsic.
+
+ The min-content and max-content contributions actually depend
+ on the computed inline size of the block:
+ * for min-content,max-content or definite sizes: min-content
+ and max-content contributions are the inline size plus border,
+ margin and padding.
+ * otherwise: min-content contribution is the min-content size
+ and max-content contribution is the max-content size (in both
+ cases plus border, padding and margin).
+
+ Tests: fast/css-intrinsic-dimensions/auto-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/auto-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/fillavailable-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/fillavailable-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/fitcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/fitcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-1.html
+ fast/css-intrinsic-dimensions/fixed-inlinesize-contribution-nonreplaced-blocks-2.html
+ fast/css-intrinsic-dimensions/indefinite-percent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/indefinite-percent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/maxcontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/maxcontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/mincontent-maxcontent-inlinesize-contribution-nonreplaced-blocks.html
+ fast/css-intrinsic-dimensions/mincontent-mincontent-inlinesize-contribution-nonreplaced-blocks.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeBlockPreferredLogicalWidths):
+
</ins><span class="cx"> 2015-12-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up absolute positioned map properly.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp (195130 => 195131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp 2016-01-15 13:23:16 UTC (rev 195130)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp 2016-01-15 13:41:51 UTC (rev 195131)
</span><span class="lines">@@ -2759,8 +2759,27 @@
</span><span class="cx"> childBox.computeLogicalHeight(childBox.borderAndPaddingLogicalHeight(), 0, computedValues);
</span><span class="cx"> childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = computedValues.m_extent;
</span><span class="cx"> } else {
</span><del>- childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
- childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();
</del><ins>+ if (is<RenderBlock>(*child) && !is<RenderTable>(*child)) {
+ const Length& computedInlineSize = child->style().logicalWidth();
+ if (computedInlineSize.isFitContent() || computedInlineSize.isFillAvailable() || computedInlineSize.isAuto()
+ || computedInlineSize.isPercentOrCalculated()) {
+ // FIXME: we could do a lot better for percents (we're considering them always indefinite)
+ // but we need https://bugs.webkit.org/show_bug.cgi?id=152262 to be fixed first
+ childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
+ childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();
+ } else {
+ ASSERT(computedInlineSize.isMinContent() || computedInlineSize.isMaxContent() || computedInlineSize.isFixed());
+ LogicalExtentComputedValues computedValues;
+ downcast<RenderBlock>(*child).computeLogicalWidthInRegion(computedValues);
+ childMinPreferredLogicalWidth = childMaxPreferredLogicalWidth = computedValues.m_extent;
+ child->setPreferredLogicalWidthsDirty(false);
+ }
+ } else {
+ // FIXME: we leave the original implementation as default fallback. Still need to specialcase
+ // some other situations: https://drafts.csswg.org/css-sizing/#intrinsic
+ childMinPreferredLogicalWidth = child->minPreferredLogicalWidth();
+ childMaxPreferredLogicalWidth = child->maxPreferredLogicalWidth();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit w = childMinPreferredLogicalWidth + margin;
</span></span></pre>
</div>
</div>
</body>
</html>