<!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>[214517] 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/214517">214517</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 20:28:12 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214232">r214232</a>. rdar://problem/30922105</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="#branchessafari603branchSourceWebCorestyleRenderTreeUpdatercpp">branches/safari-603-branch/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomslotwithcontinuationdescendantsexpectedtxt">branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomslotwithcontinuationdescendantshtml">branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.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 (214516 => 214517)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 03:28:08 UTC (rev 214516)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 03:28:12 UTC (rev 214517)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-28 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r214232. rdar://problem/30922105
+
+ 2017-03-21 Zalan Bujtas <zalan@apple.com>
+
+ Tear down descendant renderers when <slot>'s display value is set to no "contents".
+ https://bugs.webkit.org/show_bug.cgi?id=169921
+ <rdar://problem/30336417>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/shadow-dom/slot-with-continuation-descendants-expected.txt: Added.
+ * fast/shadow-dom/slot-with-continuation-descendants.html: Added.
+
+2017-03-28 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r211645. rdar://problem/30922105
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomslotwithcontinuationdescendantsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt (0 => 214517)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt 2017-03-29 03:28:12 UTC (rev 214517)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash
+or assert.
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomslotwithcontinuationdescendantshtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html (0 => 214517)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html 2017-03-29 03:28:12 UTC (rev 214517)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can handle continuation when "display: contents" element becomes non-contents</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<slot id=slot>PASS if no crash<span><div></div></span>or assert.</slot>
+<script>
+document.body.offsetHeight;
+slot.style.display = "inline";
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214516 => 214517)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 03:28:08 UTC (rev 214516)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 03:28:12 UTC (rev 214517)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-03-28 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r214232. rdar://problem/30922105
+
+ 2017-03-21 Zalan Bujtas <zalan@apple.com>
+
+ Tear down descendant renderers when <slot>'s display value is set to no "contents".
+ https://bugs.webkit.org/show_bug.cgi?id=169921
+ <rdar://problem/30336417>
+
+ Reviewed by Antti Koivisto.
+
+ Since "display: contents" does not generate a renderer, when an element's display value is
+ changed to something other than "contents", we not only create a renderer but also reparent its descendant
+ subtree (e.g from slot's parent to the newly constructed slot renderer). During this reparenting, we
+ need to tear down the descendant subtree tree and build it up again to reflect the new rendering context.
+
+ Test: fast/shadow-dom/slot-with-continuation-descendants.html
+
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+2017-03-28 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r211645. rdar://problem/30922105
</span><span class="cx">
</span><span class="cx"> 2017-02-03 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/style/RenderTreeUpdater.cpp (214516 => 214517)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-29 03:28:08 UTC (rev 214516)
+++ branches/safari-603-branch/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-29 03:28:12 UTC (rev 214517)
</span><span class="lines">@@ -253,7 +253,8 @@
</span><span class="cx"> CheckForVisibilityChange checkForVisibilityChange(element);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldTearDownRenderers = update.change == Style::Detach && (element.renderer() || element.isNamedFlowContentElement());
</del><ins>+ bool shouldTearDownRenderers = update.change == Style::Detach
+ && (element.renderer() || element.isNamedFlowContentElement() || element.hasDisplayContents());
</ins><span class="cx"> if (shouldTearDownRenderers)
</span><span class="cx"> tearDownRenderers(element, TeardownType::KeepHoverAndActive);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>