<!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>[209158] 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/209158">209158</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 15:12:45 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
https://bugs.webkit.org/show_bug.cgi?id=155364
<rdar://problem/27720461>
Reviewed by David Hyatt.
Source/WebCore:
RenderNamedFlowThread is considered to be a root for the current renderer context so
we need to bail out from the containing block traversal here (like we do for the RenderView).
Test: fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
LayoutTests:
* fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt: Added.
* fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastreplacedreplacedelementwithpercentagewidthinsideflowassertsexpectedtxt">trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastreplacedreplacedelementwithpercentagewidthinsideflowassertshtml">trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209157 => 209158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-30 22:59:28 UTC (rev 209157)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-30 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
+ https://bugs.webkit.org/show_bug.cgi?id=155364
+ <rdar://problem/27720461>
+
+ Reviewed by David Hyatt.
+
+ * fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt: Added.
+ * fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html: Added.
+
</ins><span class="cx"> 2016-11-30 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::wrapKey to match the latest spec
</span></span></pre></div>
<a id="trunkLayoutTestsfastreplacedreplacedelementwithpercentagewidthinsideflowassertsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt (0 => 209158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts-expected.txt 2016-11-30 23:12:45 UTC (rev 209158)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no assert in debug.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastreplacedreplacedelementwithpercentagewidthinsideflowassertshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html (0 => 209158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html 2016-11-30 23:12:45 UTC (rev 209158)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+<style>
+canvas {
+ width: 100%;
+ position: fixed;
+ -webkit-flow-into: foobar;
+ -webkit-writing-mode: vertical-lr;
+}
+</style>
+</head>
+<body>
+<canvas></canvas>
+PASS if no assert in debug.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209157 => 209158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 22:59:28 UTC (rev 209157)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 23:12:45 UTC (rev 209158)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-30 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
+ https://bugs.webkit.org/show_bug.cgi?id=155364
+ <rdar://problem/27720461>
+
+ Reviewed by David Hyatt.
+
+ RenderNamedFlowThread is considered to be a root for the current renderer context so
+ we need to bail out from the containing block traversal here (like we do for the RenderView).
+
+ Test: fast/replaced/replaced-element-with-percentage-width-inside-flow-asserts.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+
</ins><span class="cx"> 2016-11-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Send operations off to the server in batches instead of one at a time.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (209157 => 209158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-11-30 22:59:28 UTC (rev 209157)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-11-30 23:12:45 UTC (rev 209158)
</span><span class="lines">@@ -3141,17 +3141,22 @@
</span><span class="cx"> case Percent:
</span><span class="cx"> case Calculated:
</span><span class="cx"> {
</span><del>- auto cb = isOutOfFlowPositioned() ? container() : containingBlock();
- while (cb && cb->isAnonymous() && !is<RenderView>(*cb)) {
- cb = cb->containingBlock();
- downcast<RenderBlock>(*cb).addPercentHeightDescendant(const_cast<RenderBox&>(*this));
</del><ins>+ auto* container = isOutOfFlowPositioned() ? this->container() : containingBlock();
+ while (container && container->isAnonymous()) {
+ // Stop at rendering context root.
+ if (is<RenderView>(*container) || is<RenderNamedFlowThread>(*container))
+ break;
+ container = container->containingBlock();
+ downcast<RenderBlock>(*container).addPercentHeightDescendant(const_cast<RenderBox&>(*this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This calculation is not patched for block-flow yet.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46500
</span><del>- if (cb->isOutOfFlowPositioned() && cb->style().height().isAuto() && !(cb->style().top().isAuto() || cb->style().bottom().isAuto())) {
- ASSERT_WITH_SECURITY_IMPLICATION(cb->isRenderBlock());
- RenderBlock& block = downcast<RenderBlock>(*cb);
</del><ins>+ if (container->isOutOfFlowPositioned()
+ && container->style().height().isAuto()
+ && !(container->style().top().isAuto() || container->style().bottom().isAuto())) {
+ ASSERT_WITH_SECURITY_IMPLICATION(container->isRenderBlock());
+ auto& block = downcast<RenderBlock>(*container);
</ins><span class="cx"> LogicalExtentComputedValues computedValues;
</span><span class="cx"> block.computeLogicalHeight(block.logicalHeight(), 0, computedValues);
</span><span class="cx"> LayoutUnit newContentHeight = computedValues.m_extent - block.borderAndPaddingLogicalHeight() - block.scrollbarLogicalHeight();
</span><span class="lines">@@ -3164,7 +3169,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46496
</span><span class="cx"> LayoutUnit availableHeight;
</span><span class="cx"> if (isOutOfFlowPositioned())
</span><del>- availableHeight = containingBlockLogicalHeightForPositioned(downcast<RenderBoxModelObject>(*cb));
</del><ins>+ availableHeight = containingBlockLogicalHeightForPositioned(downcast<RenderBoxModelObject>(*container));
</ins><span class="cx"> else {
</span><span class="cx"> availableHeight = containingBlockLogicalHeightForContent(IncludeMarginBorderPadding);
</span><span class="cx"> // It is necessary to use the border-box to match WinIE's broken
</span><span class="lines">@@ -3172,15 +3177,16 @@
</span><span class="cx"> // table cells using percentage heights.
</span><span class="cx"> // FIXME: This needs to be made block-flow-aware. If the cell and image are perpendicular block-flows, this isn't right.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46997
</span><del>- while (cb && !is<RenderView>(*cb) && (cb->style().logicalHeight().isAuto() || cb->style().logicalHeight().isPercentOrCalculated())) {
- if (cb->isTableCell()) {
</del><ins>+ while (container && !is<RenderView>(*container)
+ && (container->style().logicalHeight().isAuto() || container->style().logicalHeight().isPercentOrCalculated())) {
+ if (container->isTableCell()) {
</ins><span class="cx"> // Don't let table cells squeeze percent-height replaced elements
</span><span class="cx"> // <http://bugs.webkit.org/show_bug.cgi?id=15359>
</span><span class="cx"> availableHeight = std::max(availableHeight, intrinsicLogicalHeight());
</span><span class="cx"> return valueForLength(logicalHeight, availableHeight - borderAndPaddingLogicalHeight());
</span><span class="cx"> }
</span><del>- downcast<RenderBlock>(*cb).addPercentHeightDescendant(const_cast<RenderBox&>(*this));
- cb = cb->containingBlock();
</del><ins>+ downcast<RenderBlock>(*container).addPercentHeightDescendant(const_cast<RenderBox&>(*this));
+ container = container->containingBlock();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(logicalHeight, availableHeight));
</span></span></pre>
</div>
</div>
</body>
</html>