<!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>[210534] 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/210534">210534</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 18:17:19 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: newLogicalTop >= logicalTop in WebCore::RenderBlockFlow::getClearDelta
https://bugs.webkit.org/show_bug.cgi?id=151202
<rdar://problem/27711822>
Reviewed by Myles C. Maxfield.
Source/WebCore:
FindNextFloatLogicalBottomAdapter uses LayoutUnit::max() to flag m_nextLogicalBottom uninitialized.
However LayoutUnit::max() can also be a valid value for m_nextLogicalBottom.
FindNextFloatLogicalBottomAdapter::nextLogicalBottom() returns 0 instead of the actual value when
it sees m_nextLogicalBottom uninitialized. In certain cases, it confuses the caller and we end up
with a runaway loop.
Test: fast/block/float/assert-when-line-has-not-enough-space-left.html
* rendering/FloatingObjects.cpp:
(WebCore::FindNextFloatLogicalBottomAdapter::FindNextFloatLogicalBottomAdapter):
(WebCore::FindNextFloatLogicalBottomAdapter::highValue):
(WebCore::FindNextFloatLogicalBottomAdapter::nextLogicalBottom):
(WebCore::FindNextFloatLogicalBottomAdapter::nextShapeLogicalBottom):
(WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
LayoutTests:
* fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt: Added.
* fast/block/float/assert-when-line-has-not-enough-space-left.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="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockfloatassertwhenlinehasnotenoughspaceleftexpectedtxt">trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastblockfloatassertwhenlinehasnotenoughspacelefthtml">trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210533 => 210534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-01-10 01:28:53 UTC (rev 210533)
+++ trunk/LayoutTests/ChangeLog        2017-01-10 02:17:19 UTC (rev 210534)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-09 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: newLogicalTop >= logicalTop in WebCore::RenderBlockFlow::getClearDelta
+ https://bugs.webkit.org/show_bug.cgi?id=151202
+ <rdar://problem/27711822>
+
+ Reviewed by Myles C. Maxfield.
+
+ * fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt: Added.
+ * fast/block/float/assert-when-line-has-not-enough-space-left.html: Added.
+
</ins><span class="cx"> 2017-01-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Unindenting text inside a blockquote can result in the text being reordered
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatassertwhenlinehasnotenoughspaceleftexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt (0 => 210534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left-expected.txt        2017-01-10 02:17:19 UTC (rev 210534)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or hang.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatassertwhenlinehasnotenoughspacelefthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left.html (0 => 210534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left.html         (rev 0)
+++ trunk/LayoutTests/fast/block/float/assert-when-line-has-not-enough-space-left.html        2017-01-10 02:17:19 UTC (rev 210534)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can handle float placement even when the float takes over the entire line.</title>
+<style>
+th {
+ margin: 100000000px;
+}
+tr, th {
+ float: left;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+PASS if no crash or hang.
+<table><tr><th></th><td></td></tr></table>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210533 => 210534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-01-10 01:28:53 UTC (rev 210533)
+++ trunk/Source/WebCore/ChangeLog        2017-01-10 02:17:19 UTC (rev 210534)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-01-09 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: newLogicalTop >= logicalTop in WebCore::RenderBlockFlow::getClearDelta
+ https://bugs.webkit.org/show_bug.cgi?id=151202
+ <rdar://problem/27711822>
+
+ Reviewed by Myles C. Maxfield.
+
+ FindNextFloatLogicalBottomAdapter uses LayoutUnit::max() to flag m_nextLogicalBottom uninitialized.
+ However LayoutUnit::max() can also be a valid value for m_nextLogicalBottom.
+ FindNextFloatLogicalBottomAdapter::nextLogicalBottom() returns 0 instead of the actual value when
+ it sees m_nextLogicalBottom uninitialized. In certain cases, it confuses the caller and we end up
+ with a runaway loop.
+
+ Test: fast/block/float/assert-when-line-has-not-enough-space-left.html
+
+ * rendering/FloatingObjects.cpp:
+ (WebCore::FindNextFloatLogicalBottomAdapter::FindNextFloatLogicalBottomAdapter):
+ (WebCore::FindNextFloatLogicalBottomAdapter::highValue):
+ (WebCore::FindNextFloatLogicalBottomAdapter::nextLogicalBottom):
+ (WebCore::FindNextFloatLogicalBottomAdapter::nextShapeLogicalBottom):
+ (WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
+
</ins><span class="cx"> 2017-01-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r210531.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (210533 => 210534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp        2017-01-10 01:28:53 UTC (rev 210533)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp        2017-01-10 02:17:19 UTC (rev 210534)
</span><span class="lines">@@ -185,39 +185,35 @@
</span><span class="cx"> FindNextFloatLogicalBottomAdapter(const RenderBlockFlow& renderer, LayoutUnit belowLogicalHeight)
</span><span class="cx"> : m_renderer(renderer)
</span><span class="cx"> , m_belowLogicalHeight(belowLogicalHeight)
</span><del>- , m_aboveLogicalHeight(LayoutUnit::max())
- , m_nextLogicalBottom(LayoutUnit::max())
- , m_nextShapeLogicalBottom(LayoutUnit::max())
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit lowValue() const { return m_belowLogicalHeight; }
</span><del>- LayoutUnit highValue() const { return m_aboveLogicalHeight; }
</del><ins>+ LayoutUnit highValue() const { return LayoutUnit::max(); }
</ins><span class="cx"> void collectIfNeeded(const IntervalType&);
</span><span class="cx">
</span><del>- LayoutUnit nextLogicalBottom() { return m_nextLogicalBottom == LayoutUnit::max() ? LayoutUnit() : m_nextLogicalBottom; }
- LayoutUnit nextShapeLogicalBottom() { return m_nextShapeLogicalBottom == LayoutUnit::max() ? nextLogicalBottom() : m_nextShapeLogicalBottom; }
</del><ins>+ LayoutUnit nextLogicalBottom() const { return m_nextLogicalBottom.value_or(0); }
+ LayoutUnit nextShapeLogicalBottom() const { return m_nextShapeLogicalBottom.value_or(nextLogicalBottom()); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const RenderBlockFlow& m_renderer;
</span><span class="cx"> LayoutUnit m_belowLogicalHeight;
</span><del>- LayoutUnit m_aboveLogicalHeight;
- LayoutUnit m_nextLogicalBottom;
- LayoutUnit m_nextShapeLogicalBottom;
</del><ins>+ std::optional<LayoutUnit> m_nextLogicalBottom;
+ std::optional<LayoutUnit> m_nextShapeLogicalBottom;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void FindNextFloatLogicalBottomAdapter::collectIfNeeded(const IntervalType& interval)
</span><span class="cx"> {
</span><span class="cx"> const auto& floatingObject = *interval.data();
</span><del>- if (!rangesIntersect(interval.low(), interval.high(), m_belowLogicalHeight, m_aboveLogicalHeight))
</del><ins>+ if (!rangesIntersect(interval.low(), interval.high(), m_belowLogicalHeight, LayoutUnit::max()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // All the objects returned from the tree should be already placed.
</span><span class="cx"> ASSERT(floatingObject.isPlaced());
</span><del>- ASSERT(rangesIntersect(m_renderer.logicalTopForFloat(floatingObject), m_renderer.logicalBottomForFloat(floatingObject), m_belowLogicalHeight, m_aboveLogicalHeight));
</del><ins>+ ASSERT(rangesIntersect(m_renderer.logicalTopForFloat(floatingObject), m_renderer.logicalBottomForFloat(floatingObject), m_belowLogicalHeight, LayoutUnit::max()));
</ins><span class="cx">
</span><span class="cx"> LayoutUnit floatBottom = m_renderer.logicalBottomForFloat(floatingObject);
</span><del>- if (m_nextLogicalBottom < floatBottom)
</del><ins>+ if (m_nextLogicalBottom && m_nextLogicalBottom.value() < floatBottom)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (ShapeOutsideInfo* shapeOutside = floatingObject.renderer().shapeOutsideInfo()) {
</span></span></pre>
</div>
</div>
</body>
</html>