<!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>[204980] 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/204980">204980</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-08-25 11:41:22 -0700 (Thu, 25 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Infinite recursion crash in WebCore::RenderBlockFlow::layoutBlock
https://bugs.webkit.org/show_bug.cgi?id=139474
<rdar://problem/27705190>
Reviewed by David Hyatt.
Source/WebCore:
We should just give up trying to avoid widow when the page is too small to break line.
Test: fast/multicol/assert-on-small-page-height-with-widow.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::clearShouldBreakAtLineToAvoidWidowIfNeeded):
(WebCore::RenderBlockFlow::adjustLinePositionForPagination):
* rendering/RenderBlockFlow.h:
LayoutTests:
* fast/multicol/assert-on-small-page-height-with-widow-expected.txt: Added.
* fast/multicol/assert-on-small-page-height-with-widow.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="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolassertonsmallpageheightwithwidowexpectedtxt">trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolassertonsmallpageheightwithwidowhtml">trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204979 => 204980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-25 18:39:22 UTC (rev 204979)
+++ trunk/LayoutTests/ChangeLog 2016-08-25 18:41:22 UTC (rev 204980)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-25 Zalan Bujtas <zalan@apple.com>
+
+ Infinite recursion crash in WebCore::RenderBlockFlow::layoutBlock
+ https://bugs.webkit.org/show_bug.cgi?id=139474
+ <rdar://problem/27705190>
+
+ Reviewed by David Hyatt.
+
+ * fast/multicol/assert-on-small-page-height-with-widow-expected.txt: Added.
+ * fast/multicol/assert-on-small-page-height-with-widow.html: Added.
+
</ins><span class="cx"> 2016-08-25 Johan K. Jensen <johan_jensen@apple.com>
</span><span class="cx">
</span><span class="cx"> Update the Resource Timing implementation
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolassertonsmallpageheightwithwidowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow-expected.txt (0 => 204980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow-expected.txt 2016-08-25 18:41:22 UTC (rev 204980)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no assert in debug.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolassertonsmallpageheightwithwidowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow.html (0 => 204980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/assert-on-small-page-height-with-widow.html 2016-08-25 18:41:22 UTC (rev 204980)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+html {
+ -webkit-column-count: 3;
+}
+
+body {
+ max-height: 0px;
+ -webkit-column-count: 3;
+ widows: 2;
+}
+span {
+ margin-right: -1px;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.<input><br><br>
+<span></span>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204979 => 204980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-25 18:39:22 UTC (rev 204979)
+++ trunk/Source/WebCore/ChangeLog 2016-08-25 18:41:22 UTC (rev 204980)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-25 Zalan Bujtas <zalan@apple.com>
+
+ Infinite recursion crash in WebCore::RenderBlockFlow::layoutBlock
+ https://bugs.webkit.org/show_bug.cgi?id=139474
+ <rdar://problem/27705190>
+
+ Reviewed by David Hyatt.
+
+ We should just give up trying to avoid widow when the page is too small to break line.
+
+ Test: fast/multicol/assert-on-small-page-height-with-widow.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::clearShouldBreakAtLineToAvoidWidowIfNeeded):
+ (WebCore::RenderBlockFlow::adjustLinePositionForPagination):
+ * rendering/RenderBlockFlow.h:
+
</ins><span class="cx"> 2016-08-24 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add the ability to override the implementation name of IDL enums and dictionaries
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (204979 => 204980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-08-25 18:39:22 UTC (rev 204979)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-08-25 18:41:22 UTC (rev 204980)
</span><span class="lines">@@ -1650,7 +1650,15 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+static void clearShouldBreakAtLineToAvoidWidowIfNeeded(RenderBlockFlow& blockFlow)
+{
+ if (!blockFlow.shouldBreakAtLineToAvoidWidow())
+ return;
+ blockFlow.clearShouldBreakAtLineToAvoidWidow();
+ blockFlow.setDidBreakAtLineToAvoidWidow();
+}
+
</ins><span class="cx"> void RenderBlockFlow::adjustLinePositionForPagination(RootInlineBox* lineBox, LayoutUnit& delta, bool& overflowsRegion, RenderFlowThread* flowThread)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Ignore anonymous inline blocks. Handle the delta already having been set because of
</span><span class="lines">@@ -1704,8 +1712,11 @@
</span><span class="cx"> logicalBottom = intMinForLayoutUnit;
</span><span class="cx"> lineBox->computeReplacedAndTextLineTopAndBottom(logicalOffset, logicalBottom);
</span><span class="cx"> lineHeight = logicalBottom - logicalOffset;
</span><del>- if (logicalOffset == intMaxForLayoutUnit || lineHeight > pageLogicalHeight)
- return; // Give up. We're genuinely too big even after excluding blank space and overflow.
</del><ins>+ if (logicalOffset == intMaxForLayoutUnit || lineHeight > pageLogicalHeight) {
+ // Give up. We're genuinely too big even after excluding blank space and overflow.
+ clearShouldBreakAtLineToAvoidWidowIfNeeded(*this);
+ return;
+ }
</ins><span class="cx"> pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1714,10 +1725,8 @@
</span><span class="cx">
</span><span class="cx"> int lineIndex = lineCount(lineBox);
</span><span class="cx"> if (remainingLogicalHeight < lineHeight || (shouldBreakAtLineToAvoidWidow() && lineBreakToAvoidWidow() == lineIndex)) {
</span><del>- if (shouldBreakAtLineToAvoidWidow() && lineBreakToAvoidWidow() == lineIndex) {
- clearShouldBreakAtLineToAvoidWidow();
- setDidBreakAtLineToAvoidWidow();
- }
</del><ins>+ if (lineBreakToAvoidWidow() == lineIndex)
+ clearShouldBreakAtLineToAvoidWidowIfNeeded(*this);
</ins><span class="cx"> // If we have a non-uniform page height, then we have to shift further possibly.
</span><span class="cx"> if (!hasUniformPageLogicalHeight && !pushToNextPageWithMinimumLogicalHeight(remainingLogicalHeight, logicalOffset, lineHeight))
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>