<!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>[214232] 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/214232">214232</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-21 14:39:01 -0700 (Tue, 21 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</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="#trunkLayoutTestsfastshadowdomslotwithcontinuationdescendantsexpectedtxt">trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomslotwithcontinuationdescendantshtml">trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214231 => 214232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-21 21:25:47 UTC (rev 214231)
+++ trunk/LayoutTests/ChangeLog 2017-03-21 21:39:01 UTC (rev 214232)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2017-03-21 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][Wayland] Enable WebGL, 3D and compositing layout tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotwithcontinuationdescendantsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt (0 => 214232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants-expected.txt 2017-03-21 21:39:01 UTC (rev 214232)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash
+or assert.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotwithcontinuationdescendantshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html (0 => 214232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-with-continuation-descendants.html 2017-03-21 21:39:01 UTC (rev 214232)
</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214231 => 214232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-21 21:25:47 UTC (rev 214231)
+++ trunk/Source/WebCore/ChangeLog 2017-03-21 21:39:01 UTC (rev 214232)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-03-19 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach TextIndicator to estimate the background color of the given Range
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (214231 => 214232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-21 21:25:47 UTC (rev 214231)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2017-03-21 21:39:01 UTC (rev 214232)
</span><span class="lines">@@ -257,7 +257,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>