<!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>[214501] trunk</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/214501">214501</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 15:48:26 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Missing render tree position invalidation when tearing down renderers for display:contents subtree
https://bugs.webkit.org/show_bug.cgi?id=170199
<rdar://problem/31260856>
Reviewed by Zalan Bujtas.
Source/WebCore:
Test: fast/shadow-dom/slot-renderer-teardown.html
* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::updateElementRenderer):
Invalidate the render tree position in case we do a teardown for an element without renderer.
LayoutTests:
* fast/shadow-dom/slot-renderer-teardown-expected.txt: Added.
* fast/shadow-dom/slot-renderer-teardown.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomslotrendererteardownexpectedtxt">trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomslotrendererteardownhtml">trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214500 => 214501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-28 22:32:43 UTC (rev 214500)
+++ trunk/LayoutTests/ChangeLog 2017-03-28 22:48:26 UTC (rev 214501)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-28 Antti Koivisto <antti@apple.com>
+
+ Missing render tree position invalidation when tearing down renderers for display:contents subtree
+ https://bugs.webkit.org/show_bug.cgi?id=170199
+ <rdar://problem/31260856>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/shadow-dom/slot-renderer-teardown-expected.txt: Added.
+ * fast/shadow-dom/slot-renderer-teardown.html: Added.
+
</ins><span class="cx"> 2017-03-28 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r214485.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotrendererteardownexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown-expected.txt (0 => 214501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown-expected.txt 2017-03-28 22:48:26 UTC (rev 214501)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if it does not assert
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotrendererteardownhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown.html (0 => 214501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-renderer-teardown.html 2017-03-28 22:48:26 UTC (rev 214501)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+:last-child {
+ -webkit-animation-name: name5;
+ -webkit-animation-duration: 10s;
+}
+@-webkit-keyframes name5 {
+ from { }
+ to { }
+}
+</style>
+<body>
+<summary>This test passes if it does not assert<div></div><slot id=slot1><div></div></slot></summary>
+</body>
+
+<script>
+document.execCommand("SelectAll");
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214500 => 214501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-28 22:32:43 UTC (rev 214500)
+++ trunk/Source/WebCore/ChangeLog 2017-03-28 22:48:26 UTC (rev 214501)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-28 Antti Koivisto <antti@apple.com>
+
+ Missing render tree position invalidation when tearing down renderers for display:contents subtree
+ https://bugs.webkit.org/show_bug.cgi?id=170199
+ <rdar://problem/31260856>
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/shadow-dom/slot-renderer-teardown.html
+
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+ Invalidate the render tree position in case we do a teardown for an element without renderer.
+
</ins><span class="cx"> 2017-03-28 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r214485.
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (214500 => 214501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-28 22:32:43 UTC (rev 214500)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-28 22:48:26 UTC (rev 214501)
</span><span class="lines">@@ -259,8 +259,13 @@
</span><span class="cx">
</span><span class="cx"> bool shouldTearDownRenderers = update.change == Style::Detach
</span><span class="cx"> && (element.renderer() || element.isNamedFlowContentElement() || element.hasDisplayContents());
</span><del>- if (shouldTearDownRenderers)
</del><ins>+ if (shouldTearDownRenderers) {
+ if (!element.renderer()) {
+ // We may be tearing down a descendant renderer cached in renderTreePosition.
+ renderTreePosition().invalidateNextSibling();
+ }
</ins><span class="cx"> tearDownRenderers(element, TeardownType::KeepHoverAndActive);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bool hasDisplayContents = update.style->display() == CONTENTS;
</span><span class="cx"> if (hasDisplayContents != element.hasDisplayContents()) {
</span></span></pre>
</div>
</div>
</body>
</html>