<!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>[214159] 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/214159">214159</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-19 18:32:27 -0700 (Sun, 19 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214059">r214059</a>. rdar://problem/31099341</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="#branchessafari603branchSourceWebCorerenderingRenderInlinecpp">branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastinlinecontinuationcrashwithanonancestorsexpectedtxt">branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastinlinecontinuationcrashwithanonancestorshtml">branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors.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 (214158 => 214159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:24 UTC (rev 214158)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:27 UTC (rev 214159)
</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 r214059. rdar://problem/31099341
+
+ 2017-03-16 Zalan Bujtas <zalan@apple.com>
+
+ Stay inside the continuation while searching for a candidate ancestor for insertion.
+ https://bugs.webkit.org/show_bug.cgi?id=169768
+ <rdar://problem/30959936>
+
+ Reviewed by David Hyatt.
+
+ * fast/inline/continuation-crash-with-anon-ancestors-expected.txt: Added.
+ * fast/inline/continuation-crash-with-anon-ancestors.html: Added.
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r214023. rdar://problem/31091039
</span><span class="cx">
</span><span class="cx"> 2017-03-15 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastinlinecontinuationcrashwithanonancestorsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors-expected.txt (0 => 214159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors-expected.txt 2017-03-20 01:32:27 UTC (rev 214159)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or assert.
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastinlinecontinuationcrashwithanonancestorshtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors.html (0 => 214159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/inline/continuation-crash-with-anon-ancestors.html 2017-03-20 01:32:27 UTC (rev 214159)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests </title>
+<script>
+function swapElements(element1, element2) {
+ var parent1 = element1.parentElement;
+ var previousSibling1 = element1.previousSibling;
+ element2.parentElement.insertBefore(element1, element2);
+ parent1.insertBefore(element2, previousSibling1);
+}
+
+function runTest() {
+ var tr = document.createElement("tr");
+ div2.parentElement.insertBefore(tr, div2);
+ document.body.offsetHeight;
+ div1.style.display = "inline";
+ document.body.offsetHeight;
+ swapElements(div2, span1);
+ swapElements(tr, span2);
+ document.body.offsetHeight;
+}
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body onload="runTest()">
+PASS if no crash or assert.
+<span id=span1></span><span id=span2></span><span><body style="display: inline-table"><div id=div1></div><div id=div2></div>
+<body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214158 => 214159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:24 UTC (rev 214158)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:27 UTC (rev 214159)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r214059. rdar://problem/31099341
+
+ 2017-03-16 Zalan Bujtas <zalan@apple.com>
+
+ Stay inside the continuation while searching for a candidate ancestor for insertion.
+ https://bugs.webkit.org/show_bug.cgi?id=169768
+ <rdar://problem/30959936>
+
+ Reviewed by David Hyatt.
+
+ Test: fast/inline/continuation-crash-with-anon-ancestors.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addChildToContinuation):
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r214023. rdar://problem/31091039
</span><span class="cx">
</span><span class="cx"> 2017-03-15 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp (214158 => 214159)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp 2017-03-20 01:32:24 UTC (rev 214158)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp 2017-03-20 01:32:27 UTC (rev 214159)
</span><span class="lines">@@ -622,7 +622,6 @@
</span><span class="cx"> auto* flow = continuationBefore(beforeChild);
</span><span class="cx"> // It may or may not be the direct parent of the beforeChild.
</span><span class="cx"> RenderBoxModelObject* beforeChildAncestor = nullptr;
</span><del>- // In case of anonymous wrappers, the parent of the beforeChild is mostly irrelevant. What we need is the topmost wrapper.
</del><span class="cx"> if (!beforeChild) {
</span><span class="cx"> auto* continuation = nextContinuation(flow);
</span><span class="cx"> beforeChildAncestor = continuation ? continuation : flow;
</span><span class="lines">@@ -629,9 +628,14 @@
</span><span class="cx"> } else if (canUseAsParentForContinuation(beforeChild->parent()))
</span><span class="cx"> beforeChildAncestor = downcast<RenderBoxModelObject>(beforeChild->parent());
</span><span class="cx"> else if (beforeChild->parent()) {
</span><ins>+ // In case of anonymous wrappers, the parent of the beforeChild is mostly irrelevant. What we need is the topmost wrapper.
</ins><span class="cx"> auto* parent = beforeChild->parent();
</span><del>- while (parent && parent->parent() && parent->parent()->isAnonymous())
</del><ins>+ while (parent && parent->parent() && parent->parent()->isAnonymous()) {
+ // The ancestor candidate needs to be inside the continuation.
+ if (parent->hasContinuation())
+ break;
</ins><span class="cx"> parent = parent->parent();
</span><ins>+ }
</ins><span class="cx"> ASSERT(parent && parent->parent());
</span><span class="cx"> beforeChildAncestor = downcast<RenderBoxModelObject>(parent->parent());
</span><span class="cx"> } else
</span></span></pre>
</div>
</div>
</body>
</html>