<!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>[191336] 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/191336">191336</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2015-10-20 02:57:23 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
https://bugs.webkit.org/show_bug.cgi?id=149459
Reviewed by Darin Adler.
Source/WebCore:
This was regressed after 189567 where min-height|width:auto
support was added to flex items. The merge from Blink changes
was not correctly done for assertions. In particular we were
asserting if the resolved main size was not strictly greater
than 0, but 0 is actually a valid value.
Test: fast/flexbox/crash-resolved-main-size-zero.html
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
LayoutTests:
* fast/flexbox/crash-resolved-main-size-zero-expected.txt: Added.
* fast/flexbox/crash-resolved-main-size-zero.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="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastflexboxcrashresolvedmainsizezeroexpectedtxt">trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastflexboxcrashresolvedmainsizezerohtml">trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191335 => 191336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-20 09:51:09 UTC (rev 191335)
+++ trunk/LayoutTests/ChangeLog 2015-10-20 09:57:23 UTC (rev 191336)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-13 Sergio Villar Senin <svillar@igalia.com>
+
+ ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+ https://bugs.webkit.org/show_bug.cgi?id=149459
+
+ Reviewed by Darin Adler.
+
+ * fast/flexbox/crash-resolved-main-size-zero-expected.txt: Added.
+ * fast/flexbox/crash-resolved-main-size-zero.html: Added.
+
</ins><span class="cx"> 2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
</span></span></pre></div>
<a id="trunkLayoutTestsfastflexboxcrashresolvedmainsizezeroexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt (0 => 191336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt 2015-10-20 09:57:23 UTC (rev 191336)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+* { flex-direction: column-reverse; display: flex; height: 0%; }
+if (window.testRunner) testRunner.dumpAsText();
+This test PASSES if it does not CRASH on Debug builds.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastflexboxcrashresolvedmainsizezerohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html (0 => 191336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html (rev 0)
+++ trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html 2015-10-20 09:57:23 UTC (rev 191336)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<style>
+* {
+ flex-direction: column-reverse;
+ display: flex;
+ height: 0%;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<body>
+<p>This test PASSES if it does not CRASH on Debug builds.</p>
+</body>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191335 => 191336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-20 09:51:09 UTC (rev 191335)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 09:57:23 UTC (rev 191336)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-13 Sergio Villar Senin <svillar@igalia.com>
+
+ ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+ https://bugs.webkit.org/show_bug.cgi?id=149459
+
+ Reviewed by Darin Adler.
+
+ This was regressed after 189567 where min-height|width:auto
+ support was added to flex items. The merge from Blink changes
+ was not correctly done for assertions. In particular we were
+ asserting if the resolved main size was not strictly greater
+ than 0, but 0 is actually a valid value.
+
+ Test: fast/flexbox/crash-resolved-main-size-zero.html
+
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+
</ins><span class="cx"> 2015-10-20 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Rework some readable stream internals that can be common to writable streams
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (191335 => 191336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-10-20 09:51:09 UTC (rev 191335)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-10-20 09:57:23 UTC (rev 191336)
</span><span class="lines">@@ -869,14 +869,14 @@
</span><span class="cx"> // This is the implementation of CSS flexbox section 4.5 which defines the minimum size of "pure" flex
</span><span class="cx"> // items. For any other item the value should be 0, this also includes RenderFlexibleBox's derived clases
</span><span class="cx"> // (RenderButton, RenderFullScreen...) because that's just an implementation detail.
</span><del>- LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).valueOr(0);
- ASSERT(computeMainAxisExtentForChild(child, MinSize, Length(MinContent)));
</del><ins>+ LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).value();
+ ASSERT(contentSize >= 0);
</ins><span class="cx"> contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
</span><span class="cx">
</span><span class="cx"> Length mainSize = isHorizontalFlow() ? child.style().width() : child.style().height();
</span><span class="cx"> if (!mainAxisLengthIsIndefinite(mainSize)) {
</span><del>- LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize).valueOr(0);
- ASSERT(computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize));
</del><ins>+ LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize).value();
+ ASSERT(resolvedMainSize >= 0);
</ins><span class="cx"> LayoutUnit specifiedSize = std::min(resolvedMainSize, maxExtent.valueOr(resolvedMainSize));
</span><span class="cx">
</span><span class="cx"> return std::max(childSize, std::min(specifiedSize, contentSize));
</span></span></pre>
</div>
</div>
</body>
</html>