<!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>[175553] branches/safari-600.3-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/175553">175553</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 10:42:28 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175345">r175345</a>. <rdar://problem/18856263></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestsChangeLog">branches/safari-600.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRenderBlockFlowcpp">branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebCorerenderingRootInlineBoxh">branches/safari-600.3-branch/Source/WebCore/rendering/RootInlineBox.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6003branchLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloatexpectedtxt">branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float-expected.txt</a></li>
<li><a href="#branchessafari6003branchLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloathtml">branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/LayoutTests/ChangeLog (175552 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-11-04 18:38:24 UTC (rev 175552)
+++ branches/safari-600.3-branch/LayoutTests/ChangeLog 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-11-04 Dana Burkart <dburkart@apple.com>
+
+ Merge r175345. <rdar://problem/18856263>
+
+ 2014-10-29 Zalan Bujtas <zalan@apple.com>
+
+ Remove invalid float from RootInlineBox.
+ https://bugs.webkit.org/show_bug.cgi?id=137707
+
+ Reviewed by Antti Koivisto.
+
+ In certain cases, floating boxes get attached to the last (root) inline box.
+ When this particular floating box gets destroyed, it also needs to be detached
+ from the last inline box.
+
+ * fast/inline/crash-when-inline-box-has-invalid-float-expected.txt: Added.
+ * fast/inline/crash-when-inline-box-has-invalid-float.html: Added.
+
</ins><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r175197. <rdar://problem/18856002>
</span></span></pre></div>
<a id="branchessafari6003branchLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloatexpectedtxtfromrev175345trunkLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloatexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float-expected.txt (from rev 175345, trunk/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float-expected.txt) (0 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float-expected.txt (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float-expected.txt 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS, if no crash or ASSERT in debug.
+
+
+
+
+BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBAAAAAAAAAAAAAAAAAAAAAA
</ins></span></pre></div>
<a id="branchessafari6003branchLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloathtmlfromrev175345trunkLayoutTestsfastinlinecrashwheninlineboxhasinvalidfloathtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float.html (from rev 175345, trunk/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float.html) (0 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float.html (rev 0)
+++ branches/safari-600.3-branch/LayoutTests/fast/inline/crash-when-inline-box-has-invalid-float.html 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that floating elments are cleaned up properly.</title>
+<style>
+ :last-child {float:left;}
+</style>
+</head>
+
+<body>
+PASS, if no crash or ASSERT in debug.
+<br>
+<br>
+<br>
+<article>
+<pre></pre>
+<br>
+<content>
+<br>
+<select></select>
+<script>
+document.body.contentEditable = "true";
+document.execCommand("SelectAll");
+document.execCommand("StrikeThrough");
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBAAAAAAAAAAAAAAAAAAAAAA
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175552 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-04 18:38:24 UTC (rev 175552)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-04 Dana Burkart <dburkart@apple.com>
+
+ Merge r175345. <rdar://problem/18856263>
+
+ 2014-10-29 Zalan Bujtas <zalan@apple.com>
+
+ Remove invalid float from RootInlineBox.
+ https://bugs.webkit.org/show_bug.cgi?id=137707
+
+ Reviewed by Antti Koivisto.
+
+ In certain cases, floating boxes get attached to the last (root) inline box.
+ When this particular floating box gets destroyed, it also needs to be detached
+ from the last inline box.
+ 1. Introduce RootInlineBox::removeFloat() (vs. RootInlineBox::appendFloat())
+ 2. Ensure that it is called when the floating box is being destroyed.
+
+ Test: fast/inline/crash-when-inline-box-has-invalid-float.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::removeFloatingObject):
+ (WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout): During style recalc, while
+ tearing down the render tree, we can get to a state where a block element has both inline and block children.
+ It happens when the style change on an element makes sibling anonymous block wrappers detached.
+ In that case the markAllDescendantsWithFloatsForLayout() call does not get propagated down on the
+ block child elements as we return early at the childrenInline() check.
+ * rendering/RootInlineBox.h:
+ (WebCore::RootInlineBox::removeFloat):
+
</ins><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r175197. <rdar://problem/18856002>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlockFlow.cpp (175552 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-04 18:38:24 UTC (rev 175552)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -2246,6 +2246,7 @@
</span><span class="cx"> logicalBottom = std::max(logicalBottom, logicalTop + 1);
</span><span class="cx"> }
</span><span class="cx"> if (floatingObject->originatingLine()) {
</span><ins>+ floatingObject->originatingLine()->removeFloat(floatBox);
</ins><span class="cx"> if (!selfNeedsLayout()) {
</span><span class="cx"> ASSERT(&floatingObject->originatingLine()->renderer() == this);
</span><span class="cx"> floatingObject->originatingLine()->markDirty();
</span><span class="lines">@@ -2651,10 +2652,7 @@
</span><span class="cx"> if (floatToRemove)
</span><span class="cx"> removeFloatingObject(*floatToRemove);
</span><span class="cx">
</span><del>- if (childrenInline())
- return;
-
- // Iterate over our children and mark them as needed.
</del><ins>+ // Iterate over our block children and mark them as needed.
</ins><span class="cx"> for (auto& block : childrenOfType<RenderBlock>(*this)) {
</span><span class="cx"> if (!floatToRemove && block.isFloatingOrOutOfFlowPositioned())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RootInlineBox.h (175552 => 175553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/rendering/RootInlineBox.h 2014-11-04 18:38:24 UTC (rev 175552)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RootInlineBox.h 2014-11-04 18:42:28 UTC (rev 175553)
</span><span class="lines">@@ -145,6 +145,13 @@
</span><span class="cx"> m_floats = std::make_unique<Vector<RenderBox*>>(1, &floatingBox);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void removeFloat(RenderBox& floatingBox)
+ {
+ ASSERT(m_floats);
+ ASSERT(m_floats->contains(&floatingBox));
+ m_floats->remove(m_floats->find(&floatingBox));
+ }
+
</ins><span class="cx"> Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
</span><span class="cx">
</span><span class="cx"> virtual void extractLineBoxFromRenderObject() override final;
</span></span></pre>
</div>
</div>
</body>
</html>