<!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>[214158] branches/safari-603-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/214158">214158</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-19 18:32:24 -0700 (Sun, 19 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214023">r214023</a>. rdar://problem/31091039</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderBlockFlowcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderElementcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderElementh">branches/safari-603-branch/Source/WebCore/rendering/RenderElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastblockfloatinlinebecomesfloatandmovesaroundexpectedtxt">branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastblockfloatinlinebecomesfloatandmovesaroundhtml">branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214157 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:20 UTC (rev 214157)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r214023. rdar://problem/31091039
+
+ 2017-03-15 Zalan Bujtas <zalan@apple.com>
+
+ Do not reparent floating object until after intruding/overhanging dependency is cleared.
+ https://bugs.webkit.org/show_bug.cgi?id=169711
+ <rdar://problem/30959743>
+
+ Reviewed by Simon Fraser.
+
+ * fast/block/float/inline-becomes-float-and-moves-around-expected.txt: Added.
+ * fast/block/float/inline-becomes-float-and-moves-around.html: Added.
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213967. rdar://problem/30921827
</span><span class="cx">
</span><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastblockfloatinlinebecomesfloatandmovesaroundexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around-expected.txt (0 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around-expected.txt 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+PASS if no crash or assert.
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastblockfloatinlinebecomesfloatandmovesaroundhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around.html (0 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/block/float/inline-becomes-float-and-moves-around.html 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't crash while moving floats around.</title>
+<script>
+function runTest() {
+ document.body.offsetHeight
+ div0.style.float = "right"
+ window.getSelection().addRange(document.createRange());
+ div0.parentElement.removeChild(div0)
+ document.body.offsetHeight
+ if (window.testRunner)
+ testRunner.dumpAsText();
+}
+</script>
+<body onload="runTest()">
+<div style="display: inline-flex"></div><div id=div0><li style="float: left"></li></div><br><div></div>
+PASS if no crash or assert.
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214157 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:20 UTC (rev 214157)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r214023. rdar://problem/31091039
+
+ 2017-03-15 Zalan Bujtas <zalan@apple.com>
+
+ Do not reparent floating object until after intruding/overhanging dependency is cleared.
+ https://bugs.webkit.org/show_bug.cgi?id=169711
+ <rdar://problem/30959743>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we cleanup the m_floatingObjects for siblings before reparenting the fresh float.
+
+ Test: fast/block/float/inline-becomes-float-and-moves-around.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::styleDidChange):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleDidChange):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::noLongerAffectsParentBlock):
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213967. rdar://problem/30921827
</span><span class="cx">
</span><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp (214157 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-03-20 01:32:20 UTC (rev 214157)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -2066,6 +2066,10 @@
</span><span class="cx"> parentBlock->markAllDescendantsWithFloatsForLayout();
</span><span class="cx"> parentBlock->markSiblingsWithFloatsForLayout();
</span><span class="cx"> }
</span><ins>+ // Fresh floats need to be reparented if they actually belong to the previous anonymous block.
+ // It copies the logic of RenderBlock::addChildIgnoringContinuation
+ if (noLongerAffectsParentBlock() && style().isFloating() && previousSibling() && previousSibling()->isAnonymousBlock())
+ downcast<RenderBoxModelObject>(*parent()).moveChildTo(&downcast<RenderBoxModelObject>(*previousSibling()), this);
</ins><span class="cx">
</span><span class="cx"> if (auto fragment = renderNamedFlowFragment())
</span><span class="cx"> fragment->setStyle(RenderNamedFlowFragment::createStyle(style()));
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderElement.cpp (214157 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderElement.cpp 2017-03-20 01:32:20 UTC (rev 214157)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderElement.cpp 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -997,13 +997,8 @@
</span><span class="cx"> if (s_affectsParentBlock)
</span><span class="cx"> handleDynamicFloatPositionChange();
</span><span class="cx">
</span><del>- if (s_noLongerAffectsParentBlock) {
</del><ins>+ if (s_noLongerAffectsParentBlock)
</ins><span class="cx"> removeAnonymousWrappersForInlinesIfNecessary();
</span><del>- // Fresh floats need to be reparented if they actually belong to the previous anonymous block.
- // It copies the logic of RenderBlock::addChildIgnoringContinuation
- if (style().isFloating() && previousSibling() && previousSibling()->isAnonymousBlock())
- downcast<RenderBoxModelObject>(*parent()).moveChildTo(&downcast<RenderBoxModelObject>(*previousSibling()), this);
- }
</del><span class="cx">
</span><span class="cx"> SVGRenderSupport::styleChanged(*this, oldStyle);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderElement.h (214157 => 214158)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderElement.h 2017-03-20 01:32:20 UTC (rev 214157)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderElement.h 2017-03-20 01:32:24 UTC (rev 214158)
</span><span class="lines">@@ -273,6 +273,8 @@
</span><span class="cx">
</span><span class="cx"> void removeFromRenderFlowThreadIncludingDescendants(bool shouldUpdateState);
</span><span class="cx"> void adjustFlowThreadStateOnContainingBlockChangeIfNeeded();
</span><ins>+
+ bool noLongerAffectsParentBlock() const { return s_noLongerAffectsParentBlock; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderElement(ContainerNode&, RenderStyle&&, BaseTypeFlags);
</span></span></pre>
</div>
</div>
</body>
</html>