<!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>[205439] releases/WebKitGTK/webkit-2.12</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/205439">205439</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-05 02:17:09 -0700 (Mon, 05 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204951">r204951</a> - ASSERTION FAILED: contentSize >= 0 in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
https://bugs.webkit.org/show_bug.cgi?id=155700
<rdar://problem/27720727>
Reviewed by David Hyatt.
Source/WebCore:
RenderBox::m_minPreferredLogicalWidth/m_maxPreferredLogicalWidth don't need special initial value since
preferredLogicalWidthsDirty flag guards them. -1 as initial value can cause problems for renderers that don't
override RenderBox::computePreferredLogicalWidths().
Test: fast/ruby/assert-when-content-size-is-negative.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::RenderBox):
(WebCore::RenderBox::dirtyLineBoxes):
(WebCore::RenderBox::deleteLineBoxWrapper):
* rendering/RenderBox.h:
LayoutTests:
* fast/ruby/assert-when-content-size-is-negative-expected.txt: Added.
* fast/ruby/assert-when-content-size-is-negative.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBoxcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBoxh">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastrubyassertwhencontentsizeisnegativeexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastrubyassertwhencontentsizeisnegativehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (205438 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:09:52 UTC (rev 205438)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-08-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ ASSERTION FAILED: contentSize >= 0 in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+ https://bugs.webkit.org/show_bug.cgi?id=155700
+ <rdar://problem/27720727>
+
+ Reviewed by David Hyatt.
+
+ * fast/ruby/assert-when-content-size-is-negative-expected.txt: Added.
+ * fast/ruby/assert-when-content-size-is-negative.html: Added.
+
+2016-08-24 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139396
</span><span class="cx"> <rdar://problem/27704339>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastrubyassertwhencontentsizeisnegativeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative-expected.txt (0 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative-expected.txt 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests that inline does not assert when its composite state changes.
+if (window.testRunner) testRunner.dumpAsText();
+* { display: inline-flex; flex-basis: 1; }
+PASS if no assert in debug.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastrubyassertwhencontentsizeisnegativehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative.html (0 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/ruby/assert-when-content-size-is-negative.html 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that inline does not assert when its composite state changes.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+* {
+ display: inline-flex;
+ flex-basis: 1;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<frameset></frameset>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (205438 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:09:52 UTC (rev 205438)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-08-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ ASSERTION FAILED: contentSize >= 0 in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+ https://bugs.webkit.org/show_bug.cgi?id=155700
+ <rdar://problem/27720727>
+
+ Reviewed by David Hyatt.
+
+ RenderBox::m_minPreferredLogicalWidth/m_maxPreferredLogicalWidth don't need special initial value since
+ preferredLogicalWidthsDirty flag guards them. -1 as initial value can cause problems for renderers that don't
+ override RenderBox::computePreferredLogicalWidths().
+
+ Test: fast/ruby/assert-when-content-size-is-negative.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::RenderBox):
+ (WebCore::RenderBox::dirtyLineBoxes):
+ (WebCore::RenderBox::deleteLineBoxWrapper):
+ * rendering/RenderBox.h:
+
+2016-08-24 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139396
</span><span class="cx"> <rdar://problem/27704339>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp (205438 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp 2016-09-05 09:09:52 UTC (rev 205438)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -120,9 +120,6 @@
</span><span class="cx">
</span><span class="cx"> RenderBox::RenderBox(Element& element, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
</span><span class="cx"> : RenderBoxModelObject(element, WTFMove(style), baseTypeFlags)
</span><del>- , m_minPreferredLogicalWidth(-1)
- , m_maxPreferredLogicalWidth(-1)
- , m_inlineBoxWrapper(nullptr)
</del><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="lines">@@ -129,9 +126,6 @@
</span><span class="cx">
</span><span class="cx"> RenderBox::RenderBox(Document& document, Ref<RenderStyle>&& style, BaseTypeFlags baseTypeFlags)
</span><span class="cx"> : RenderBoxModelObject(document, WTFMove(style), baseTypeFlags)
</span><del>- , m_minPreferredLogicalWidth(-1)
- , m_maxPreferredLogicalWidth(-1)
- , m_inlineBoxWrapper(nullptr)
</del><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="lines">@@ -2123,13 +2117,14 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::dirtyLineBoxes(bool fullLayout)
</span><span class="cx"> {
</span><del>- if (m_inlineBoxWrapper) {
- if (fullLayout) {
- delete m_inlineBoxWrapper;
- m_inlineBoxWrapper = nullptr;
- } else
- m_inlineBoxWrapper->dirtyLineBoxes();
- }
</del><ins>+ if (!m_inlineBoxWrapper)
+ return;
+
+ if (fullLayout) {
+ delete m_inlineBoxWrapper;
+ m_inlineBoxWrapper = nullptr;
+ } else
+ m_inlineBoxWrapper->dirtyLineBoxes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::positionLineBox(InlineElementBox& box)
</span><span class="lines">@@ -2165,12 +2160,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::deleteLineBoxWrapper()
</span><span class="cx"> {
</span><del>- if (m_inlineBoxWrapper) {
- if (!documentBeingDestroyed())
- m_inlineBoxWrapper->removeFromParent();
- delete m_inlineBoxWrapper;
- m_inlineBoxWrapper = nullptr;
- }
</del><ins>+ if (!m_inlineBoxWrapper)
+ return;
+
+ if (!documentBeingDestroyed())
+ m_inlineBoxWrapper->removeFromParent();
+ delete m_inlineBoxWrapper;
+ m_inlineBoxWrapper = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderBox::clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.h (205438 => 205439)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.h 2016-09-05 09:09:52 UTC (rev 205438)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.h 2016-09-05 09:17:09 UTC (rev 205439)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> LayoutUnit m_maxPreferredLogicalWidth;
</span><span class="cx">
</span><span class="cx"> // For inline replaced elements, the inline box that owns us.
</span><del>- InlineElementBox* m_inlineBoxWrapper;
</del><ins>+ InlineElementBox* m_inlineBoxWrapper { nullptr };
</ins><span class="cx">
</span><span class="cx"> // Our overflow information.
</span><span class="cx"> RefPtr<RenderOverflow> m_overflow;
</span></span></pre>
</div>
</div>
</body>
</html>