<!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>[168017] branches/safari-537.76-branch</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/168017">168017</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 07:23:08 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167093">r167093</a>. <rdar://problem/16701798></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCorerenderingRenderBlockh">branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#branchessafari53776branchSourceWebCorerenderingRenderObjectcpp">branches/safari-537.76-branch/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsfastflexboxcollapseanonymouswrappersassertionexpectedtxt">branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestsfastflexboxcollapseanonymouswrappersassertionhtml">branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168016 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:12:14 UTC (rev 168016)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167093
+
+ 2014-04-10 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::FlexBoxIterator::next()
+ <https://bugs.webkit.org/show_bug.cgi?id=117176>
+ <rdar://problem/14054549>
+
+ Reviewed by Tim Horton.
+
+ * fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt: Added.
+ * fast/flexbox/collapse-anonymous-wrappers-assertion.html: Added.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r167092
</span><span class="cx">
</span><span class="cx"> 2014-04-07 Jon Honeycutt <jhoneycutt@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastflexboxcollapseanonymouswrappersassertionexpectedtxtfromrev167093trunkLayoutTestsfastflexboxcollapseanonymouswrappersassertionexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt (from rev 167093, trunk/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt) (0 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion-expected.txt 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS
+
+
+WebKit Bug #117176: Assertion below WebCore::FlexBoxIterator::next(). This test passes if it does not assert in a debug build.
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastflexboxcollapseanonymouswrappersassertionhtmlfromrev167093trunkLayoutTestsfastflexboxcollapseanonymouswrappersassertionhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion.html (from rev 167093, trunk/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion.html) (0 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/flexbox/collapse-anonymous-wrappers-assertion.html 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<style>
+div {
+ display: -webkit-box;
+}
+</style>
+
+<div><div></div>PASS</div>
+
+<br><br>
+
+<span>
+ WebKit Bug #<a href="https://bugs.webkit.org/show_bug.cgi?id=117176">117176</a>: Assertion below WebCore::FlexBoxIterator::next(). This test passes if it does not assert in a debug build.
+</span>
+
+<script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ style = document.getElementsByTagName("style")[0];
+ style.innerText += "div:last-child { position: absolute; }";
+</script>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168016 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:12:14 UTC (rev 168016)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167093
+
+ 2014-04-08 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure in WebCore::FlexBoxIterator::next()
+ <https://bugs.webkit.org/show_bug.cgi?id=117176>
+ <rdar://problem/14054549>
+
+ Code added in r115687 began removing anonymous wrappers when children
+ become inline. However, there are some objects, like
+ RenderDeprecatedFlexBox, whose children should always be blocks.
+
+ Reviewed by Tim Horton.
+
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::canCollapseAnonymousBlockChild):
+ Made public.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::removeAnonymousWrappersForInlinesIfNecessary):
+ Return early if we can't collapse anonymous block children.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r167092
</span><span class="cx">
</span><span class="cx"> 2014-04-07 Jon Honeycutt <jhoneycutt@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.h (168016 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.h 2014-04-30 14:12:14 UTC (rev 168016)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.h 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -473,6 +473,8 @@
</span><span class="cx"> bool allowsShapeInsideInfoSharing() const { return !isInline() && !isFloating(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual bool canCollapseAnonymousBlockChild() const { return true; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void willBeDestroyed();
</span><span class="cx">
</span><span class="lines">@@ -1152,8 +1154,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool updateLogicalWidthAndColumnWidth();
</span><span class="cx">
</span><del>- virtual bool canCollapseAnonymousBlockChild() const { return true; }
-
</del><span class="cx"> public:
</span><span class="cx"> virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const;
</span><span class="cx"> RenderRegion* regionAtBlockOffset(LayoutUnit) const;
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/rendering/RenderObject.cpp (168016 => 168017)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/rendering/RenderObject.cpp 2014-04-30 14:12:14 UTC (rev 168016)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/RenderObject.cpp 2014-04-30 14:23:08 UTC (rev 168017)
</span><span class="lines">@@ -1698,6 +1698,10 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::removeAnonymousWrappersForInlinesIfNecessary()
</span><span class="cx"> {
</span><ins>+ RenderBlock* parentBlock = toRenderBlock(parent());
+ if (!parentBlock->canCollapseAnonymousBlockChild())
+ return;
+
</ins><span class="cx"> // We have changed to floated or out-of-flow positioning so maybe all our parent's
</span><span class="cx"> // children can be inline now. Bail if there are any block children left on the line,
</span><span class="cx"> // otherwise we can proceed to stripping solitary anonymous wrappers from the inlines.
</span><span class="lines">@@ -1711,7 +1715,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> curr = parent()->firstChild();
</span><del>- RenderBlock* parentBlock = toRenderBlock(parent());
</del><span class="cx"> while (curr) {
</span><span class="cx"> RenderObject* next = curr->nextSibling();
</span><span class="cx"> if (curr->isAnonymousBlock())
</span></span></pre>
</div>
</div>
</body>
</html>