<!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>[209259] 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/209259">209259</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 13:25:15 -0800 (Fri, 02 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: flowThread->regionInRange(region, startRegion, endRegion) in WebCore::RenderBox::borderBoxRectInRegion
https://bugs.webkit.org/show_bug.cgi?id=152113
<rdar://problem/27720221>
Reviewed by David Hyatt.
Source/WebCore:
In a nested column context, do not process a spanner if it belongs to an inner column.
While populating a flow, we search for possible spanners and construct multicolumnsets accordingly.
However due to the top-down nature of populating flows, a descendant spanner could belong to an inner
flow which hasn't been populated yet.
This patch checks if a potential spanner has an ancestor (which is also a descendant
of the flow that we are populating -> nested) that will eventually create a flow context.
Test: fast/multicol/assert-with-nested-columns-and-spanner.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeColumnCountAndWidth):
(WebCore::RenderBlockFlow::willCreateColumns):
* rendering/RenderBlockFlow.h:
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::isValidColumnSpanner):
LayoutTests:
* fast/multicol/assert-with-nested-columns-and-spanner-expected.txt: Added.
* fast/multicol/assert-with-nested-columns-and-spanner.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>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolassertwithnestedcolumnsandspannerexpectedtxt">trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolassertwithnestedcolumnsandspannerhtml">trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209258 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-02 21:02:44 UTC (rev 209258)
+++ trunk/LayoutTests/ChangeLog 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-02 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: flowThread->regionInRange(region, startRegion, endRegion) in WebCore::RenderBox::borderBoxRectInRegion
+ https://bugs.webkit.org/show_bug.cgi?id=152113
+ <rdar://problem/27720221>
+
+ Reviewed by David Hyatt.
+
+ * fast/multicol/assert-with-nested-columns-and-spanner-expected.txt: Added.
+ * fast/multicol/assert-with-nested-columns-and-spanner.html: Added.
+
</ins><span class="cx"> 2016-12-02 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Make sure the z-component of transform-origin can be implicit
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolassertwithnestedcolumnsandspannerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner-expected.txt (0 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner-expected.txt 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no assert in debug.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolassertwithnestedcolumnsandspannerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner.html (0 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/assert-with-nested-columns-and-spanner.html 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+<style>
+h2 {
+ column-span: all
+}
+div {
+ column-width: 10px;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<body><div><div><h2></h2></div><video controls=""></video><h2></h2></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209258 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-02 21:02:44 UTC (rev 209258)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-02 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: flowThread->regionInRange(region, startRegion, endRegion) in WebCore::RenderBox::borderBoxRectInRegion
+ https://bugs.webkit.org/show_bug.cgi?id=152113
+ <rdar://problem/27720221>
+
+ Reviewed by David Hyatt.
+
+ In a nested column context, do not process a spanner if it belongs to an inner column.
+
+ While populating a flow, we search for possible spanners and construct multicolumnsets accordingly.
+ However due to the top-down nature of populating flows, a descendant spanner could belong to an inner
+ flow which hasn't been populated yet.
+ This patch checks if a potential spanner has an ancestor (which is also a descendant
+ of the flow that we are populating -> nested) that will eventually create a flow context.
+
+ Test: fast/multicol/assert-with-nested-columns-and-spanner.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeColumnCountAndWidth):
+ (WebCore::RenderBlockFlow::willCreateColumns):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::isValidColumnSpanner):
+
</ins><span class="cx"> 2016-12-02 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Make sure the z-component of transform-origin can be implicit
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (209258 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-02 21:02:44 UTC (rev 209258)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::computeColumnCountAndWidth()
</span><del>-{
</del><ins>+{
</ins><span class="cx"> // Calculate our column width and column count.
</span><span class="cx"> // FIXME: Can overflow on fast/block/float/float-not-removed-from-next-sibling4.html, see https://bugs.webkit.org/show_bug.cgi?id=68744
</span><span class="cx"> unsigned desiredColumnCount = 1;
</span><span class="lines">@@ -428,6 +428,30 @@
</span><span class="cx"> setComputedColumnCountAndWidth(desiredColumnCount, desiredColumnWidth);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderBlockFlow::willCreateColumns()
+{
+ if (!firstChild())
+ return false;
+
+ if (!style().specifiesColumns())
+ return false;
+
+ // column-axis initiates MultiColumnFlowThread.
+ if (!style().hasInlineColumnAxis())
+ return true;
+
+ // Non-auto column-width always initiates MultiColumnFlowThread.
+ if (!style().hasAutoColumnWidth())
+ return true;
+
+ // column-count > 1 always initiates MultiColumnFlowThread.
+ if (!style().hasAutoColumnCount())
+ return style().columnCount() > 1;
+
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
</ins><span class="cx"> void RenderBlockFlow::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(needsLayout());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (209258 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-12-02 21:02:44 UTC (rev 209258)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -282,6 +282,7 @@
</span><span class="cx">
</span><span class="cx"> RenderMultiColumnFlowThread* multiColumnFlowThread() const { return hasRareBlockFlowData() ? rareBlockFlowData()->m_multiColumnFlowThread : nullptr; }
</span><span class="cx"> void setMultiColumnFlowThread(RenderMultiColumnFlowThread*);
</span><ins>+ bool willCreateColumns();
</ins><span class="cx">
</span><span class="cx"> bool containsFloats() const override { return m_floatingObjects && !m_floatingObjects->set().isEmpty(); }
</span><span class="cx"> bool containsFloat(RenderBox&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (209258 => 209259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-12-02 21:02:44 UTC (rev 209258)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-12-02 21:25:15 UTC (rev 209259)
</span><span class="lines">@@ -240,31 +240,41 @@
</span><span class="cx"> {
</span><span class="cx"> // We assume that we're inside the flow thread. This function is not to be called otherwise.
</span><span class="cx"> ASSERT(descendant.isDescendantOf(&flowThread));
</span><del>-
</del><span class="cx"> // First make sure that the renderer itself has the right properties for becoming a spanner.
</span><del>- auto& style = descendant.style();
- if (style.columnSpan() != ColumnSpanAll || !is<RenderBox>(descendant) || descendant.isFloatingOrOutOfFlowPositioned())
</del><ins>+ if (!is<RenderBox>(descendant))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderElement* container = descendant.parent();
- if (!is<RenderBlockFlow>(*container) || container->childrenInline()) {
</del><ins>+ auto& descendantBox = downcast<RenderBox>(descendant);
+ if (descendantBox.isFloatingOrOutOfFlowPositioned())
+ return false;
+
+ if (descendantBox.style().columnSpan() != ColumnSpanAll)
+ return false;
+
+ auto* parent = descendantBox.parent();
+ if (!is<RenderBlockFlow>(*parent) || parent->childrenInline()) {
</ins><span class="cx"> // Needs to be block-level.
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We need to have the flow thread as the containing block. A spanner cannot break out of the flow thread.
</span><del>- RenderFlowThread* enclosingFlowThread = descendant.flowThreadContainingBlock();
</del><ins>+ auto* enclosingFlowThread = descendantBox.flowThreadContainingBlock();
</ins><span class="cx"> if (enclosingFlowThread != &flowThread)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // This looks like a spanner, but if we're inside something unbreakable, it's not to be treated as one.
</span><del>- for (auto* ancestor = downcast<RenderBox>(descendant).containingBlock(); ancestor && !is<RenderView>(*ancestor); ancestor = ancestor->containingBlock()) {
- if (ancestor->isRenderFlowThread()) {
</del><ins>+ for (auto* ancestor = descendantBox.containingBlock(); ancestor; ancestor = ancestor->containingBlock()) {
+ if (is<RenderView>(*ancestor))
+ return false;
+ if (is<RenderFlowThread>(*ancestor)) {
</ins><span class="cx"> // Don't allow any intervening non-multicol fragmentation contexts. The spec doesn't say
</span><span class="cx"> // anything about disallowing this, but it's just going to be too complicated to
</span><span class="cx"> // implement (not to mention specify behavior).
</span><span class="cx"> return ancestor == &flowThread;
</span><span class="cx"> }
</span><ins>+ // This ancestor (descendent of the flowThread) will create columns later. The spanner belongs to it.
+ if (is<RenderBlockFlow>(*ancestor) && downcast<RenderBlockFlow>(*ancestor).willCreateColumns())
+ return false;
</ins><span class="cx"> ASSERT(ancestor->style().columnSpan() != ColumnSpanAll || !isValidColumnSpanner(flowThread, *ancestor));
</span><span class="cx"> if (ancestor->isUnsplittableForPagination())
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>