<!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>[198990] 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/198990">198990</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-03 13:19:47 -0700 (Sun, 03 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Shadow DOM: Slot style is not computed
https://bugs.webkit.org/show_bug.cgi?id=156144

Reviewed by Darin Adler.

Source/WebCore:

We don’t currently compute style for active slots. While slots have have implicit display:contents and don’t create
boxes themselves the style should still inherit to slotted children.

Basically

&lt;slot style=“color:red”&gt;&lt;/slot&gt;

should work as expected.

The implementation falls out from the new style resolve architecture and this patch mostly just removes the special
case code that prevented this from working.

Test: fast/shadow-dom/css-scoping-shadow-slot-style.html

* html/HTMLSlotElement.h:
(WebCore::hasImplicitDisplayContents):

    Move to a shared location.

* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::RenderTreeUpdater):
(WebCore::findRenderingRoot):
(WebCore::RenderTreeUpdater::updateRenderTree):

    Remove the special case code. What remains is a display:contents test for rendererless elements.

(WebCore::RenderTreeUpdater::updateElementRenderer):

    Don't create renderers for (implicit) display:contents.

(WebCore::hasDisplayContents): Deleted.
* style/StyleTreeResolver.cpp:
(WebCore::Style::detachRenderTree):
(WebCore::Style::affectsRenderedSubtree):

    Factor into a function.

(WebCore::Style::TreeResolver::resolveElement):

    Remove the special case code.

(WebCore::Style::TreeResolver::resolveComposedTree):

    Always resolve slots as we don't currently save their style.

LayoutTests:

* fast/shadow-dom/css-scoping-shadow-slot-style-expected.html: Added.
* fast/shadow-dom/css-scoping-shadow-slot-style.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyexpectedtxt">trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSlotElementh">trunk/Source/WebCore/html/HTMLSlotElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreePositioncpp">trunk/Source/WebCore/style/RenderTreePosition.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslotstyleexpectedhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslotstylehtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/LayoutTests/ChangeLog        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-03  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Shadow DOM: Slot style is not computed
+        https://bugs.webkit.org/show_bug.cgi?id=156144
+
+        Reviewed by Darin Adler.
+
+        * fast/shadow-dom/css-scoping-shadow-slot-style-expected.html: Added.
+        * fast/shadow-dom/css-scoping-shadow-slot-style.html: Added.
+
</ins><span class="cx"> 2016-04-03  Saam barati  &lt;sbarati@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Implement Annex B.3.3 function hoisting rules for function code
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><span class="cx"> Pass.
</span><ins>+
</ins><span class="cx"> WebKit didn't Crash.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslotstyleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style-expected.html (0 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style-expected.html        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+    &lt;p&gt;Test passes if you see a single 100px by 100px green box below.&lt;/p&gt;
+    &lt;div style=&quot;width: 100px; height: 100px; background: green;&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslotstylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style.html (0 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style.html                                (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slot-style.html        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;title&gt;CSS Scoping - ensure that slot style is inherited by slotted children&lt;/title&gt;
+    &lt;link rel=&quot;author&quot; title=&quot;Ryosuke Niwa&quot; href=&quot;mailto:rniwa@webkit.org&quot;/&gt;
+    &lt;link rel=&quot;help&quot; href=&quot;http://www.w3.org/TR/css-scoping-1/#selectors-data-model&quot;&gt;
+    &lt;link rel=&quot;match&quot; href=&quot;reference/green-box.html&quot;/&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;style&gt;
+    my-host, my-non-host {
+        display: block;
+        width: 100px;
+        height: 50px;
+        overflow: hidden;
+        background: red;
+        color: red;
+    }
+    div {
+        width: 100%;
+        height: 50%;
+    }
+    &lt;/style&gt;
+    &lt;p&gt;Test passes if you see a single 100px by 100px green box below.&lt;/p&gt; 
+    &lt;my-host&gt;
+        &lt;div slot=&quot;green&quot; style=&quot;background: green;&quot;&gt;FAIL&lt;/div&gt;
+        &lt;div slot=&quot;green&quot; style=&quot;background: inherit;&quot;&gt;FAIL&lt;/div&gt;
+    &lt;/my-host&gt;
+    &lt;my-non-host&gt;
+        &lt;slot name=&quot;green&quot; style=&quot;color: green; background: green&quot;&gt;
+            &lt;div slot=&quot;green&quot; style=&quot;background: green;&quot;&gt;FAIL&lt;/div&gt;
+            &lt;div slot=&quot;green&quot; style=&quot;background: inherit;&quot;&gt;FAIL&lt;/div&gt;
+        &lt;/slot&gt;
+    &lt;/my-non-host&gt;
+    &lt;script&gt;
+
+    try {
+        var shadowHost = document.querySelector('my-host');
+        shadowRoot = shadowHost.attachShadow({mode: 'open'});
+        shadowRoot.innerHTML = '&lt;slot name=&quot;green&quot; style=&quot;color: green; background: green&quot;&gt;&lt;/slot&gt;';
+    } catch (exception) {
+        document.body.appendChild(document.createTextNode(exception));
+    }
+
+    &lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/Source/WebCore/ChangeLog        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-04-03  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Shadow DOM: Slot style is not computed
+        https://bugs.webkit.org/show_bug.cgi?id=156144
+
+        Reviewed by Darin Adler.
+
+        We don’t currently compute style for active slots. While slots have have implicit display:contents and don’t create
+        boxes themselves the style should still inherit to slotted children.
+
+        Basically
+
+        &lt;slot style=“color:red”&gt;&lt;/slot&gt;
+
+        should work as expected.
+
+        The implementation falls out from the new style resolve architecture and this patch mostly just removes the special
+        case code that prevented this from working.
+
+        Test: fast/shadow-dom/css-scoping-shadow-slot-style.html
+
+        * html/HTMLSlotElement.h:
+        (WebCore::hasImplicitDisplayContents):
+
+            Move to a shared location.
+
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::RenderTreeUpdater):
+        (WebCore::findRenderingRoot):
+        (WebCore::RenderTreeUpdater::updateRenderTree):
+
+            Remove the special case code. What remains is a display:contents test for rendererless elements.
+
+        (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+            Don't create renderers for (implicit) display:contents.
+
+        (WebCore::hasDisplayContents): Deleted.
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::detachRenderTree):
+        (WebCore::Style::affectsRenderedSubtree):
+
+            Factor into a function.
+
+        (WebCore::Style::TreeResolver::resolveElement):
+
+            Remove the special case code.
+
+        (WebCore::Style::TreeResolver::resolveComposedTree):
+
+            Always resolve slots as we don't currently save their style.
+
</ins><span class="cx"> 2016-04-03  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r198653, r198864): http/tests/contentdispositionattachmentsandbox/referer-header-stripped*.html tests crashing due to unavailable SPI
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSlotElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSlotElement.h (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSlotElement.h        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/Source/WebCore/html/HTMLSlotElement.h        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -53,7 +53,18 @@
</span><span class="cx">     bool m_hasEnqueuedSlotChangeEvent { false };
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+// Slots have implicit display:contents until it is supported for reals.
+inline bool hasImplicitDisplayContents(const Element&amp; element) { return is&lt;HTMLSlotElement&gt;(element); }
+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#else
+
+namespace WebCore {
+
+inline bool hasImplicitDisplayContents(const Element&amp;) { return false; }
+
+}
+
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreePosition.cpp (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreePosition.cpp        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/Source/WebCore/style/RenderTreePosition.cpp        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> 
</span><span class="cx">     while (it != end) {
</span><span class="cx">         auto&amp; node = *it;
</span><del>-        bool hasDisplayContents = is&lt;HTMLSlotElement&gt;(node);
</del><ins>+        bool hasDisplayContents = is&lt;Element&gt;(node) &amp;&amp; hasImplicitDisplayContents(downcast&lt;Element&gt;(node));
</ins><span class="cx">         if (hasDisplayContents) {
</span><span class="cx">             it.traverseNext();
</span><span class="cx">             continue;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -61,19 +61,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-// Slots have implicit display:contents until it is supported for reals.
-static bool hasDisplayContents(const Node&amp; node)
-{
-    return is&lt;HTMLSlotElement&gt;(node);
-}
-
</del><span class="cx"> static ContainerNode&amp; findRenderingRoot(ContainerNode&amp; node)
</span><span class="cx"> {
</span><span class="cx">     auto&amp; document = node.document();
</span><span class="cx">     for (ComposedTreeAncestorIterator it(document, node), end(document); it != end; ++it) {
</span><span class="cx">         if (it-&gt;renderer())
</span><span class="cx">             return *it;
</span><del>-        ASSERT(hasDisplayContents(*it));
</del><ins>+        ASSERT(hasImplicitDisplayContents(downcast&lt;Element&gt;(*it)));
</ins><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="cx">     return document;
</span><span class="lines">@@ -137,29 +131,20 @@
</span><span class="cx">         auto&amp; element = downcast&lt;Element&gt;(node);
</span><span class="cx"> 
</span><span class="cx">         auto* elementUpdate = m_styleUpdate-&gt;elementUpdate(element);
</span><del>-
-        auto changeType = Style::NoChange;
-        if (elementUpdate) {
-            if (hasDisplayContents(element)) {
-                if (!shouldCreateRenderer(element, renderTreePosition().parent())) {
-                    it.traverseNextSkippingChildren();
-                    continue;
-                }
-                pushParent(element, parent().styleChange);
-                it.traverseNext();
-                continue;
-            }
-
-            updateElementRenderer(element, *elementUpdate);
-            changeType = elementUpdate-&gt;change;
</del><ins>+        if (!elementUpdate) {
+            it.traverseNextSkippingChildren();
+            continue;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (!element.renderer() || !elementUpdate) {
</del><ins>+        updateElementRenderer(element, *elementUpdate);
+
+        bool mayHaveRenderedDescendants = element.renderer() || (hasImplicitDisplayContents(element) &amp;&amp; shouldCreateRenderer(element, renderTreePosition().parent()));
+        if (!mayHaveRenderedDescendants) {
</ins><span class="cx">             it.traverseNextSkippingChildren();
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        pushParent(element, changeType);
</del><ins>+        pushParent(element, elementUpdate ? elementUpdate-&gt;change : Style::NoChange);
</ins><span class="cx"> 
</span><span class="cx">         it.traverseNext();
</span><span class="cx">     }
</span><span class="lines">@@ -246,7 +231,7 @@
</span><span class="cx">     if (shouldTearDownRenderers)
</span><span class="cx">         detachRenderTree(element, Style::ReattachDetach);
</span><span class="cx"> 
</span><del>-    bool shouldCreateNewRenderer = !element.renderer() &amp;&amp; update.style;
</del><ins>+    bool shouldCreateNewRenderer = !element.renderer() &amp;&amp; update.style &amp;&amp; !hasImplicitDisplayContents(element);
</ins><span class="cx">     if (shouldCreateNewRenderer) {
</span><span class="cx">         if (element.hasCustomStyleResolveCallbacks())
</span><span class="cx">             element.willAttachRenderers();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (198989 => 198990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp        2016-04-03 19:45:05 UTC (rev 198989)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp        2016-04-03 20:19:47 UTC (rev 198990)
</span><span class="lines">@@ -385,14 +385,29 @@
</span><span class="cx">         current.didDetachRenderers();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static bool affectsRenderedSubtree(Element&amp; element, const RenderStyle&amp; newStyle)
+{
+    if (element.renderer())
+        return true;
+    if (newStyle.display() != NONE)
+        return true;
+    // FIXME: Make 'contents' an actual display property value.
+    if (hasImplicitDisplayContents(element))
+        return true;
+    if (element.rendererIsNeeded(newStyle))
+        return true;
+    if (element.shouldMoveToFlowThread(newStyle))
+        return true;
+    return false;
+}
+
</ins><span class="cx"> ElementUpdate TreeResolver::resolveElement(Element&amp; element)
</span><span class="cx"> {
</span><span class="cx">     auto newStyle = styleForElement(element, parent().style);
</span><span class="cx"> 
</span><span class="cx">     auto* renderer = element.renderer();
</span><span class="cx"> 
</span><del>-    bool affectsRenderedSubtree = renderer || newStyle-&gt;display() != NONE || element.rendererIsNeeded(newStyle) || element.shouldMoveToFlowThread(newStyle);
-    if (!affectsRenderedSubtree)
</del><ins>+    if (!affectsRenderedSubtree(element, newStyle.get()))
</ins><span class="cx">         return { };
</span><span class="cx"> 
</span><span class="cx">     ElementUpdate update;
</span><span class="lines">@@ -599,7 +614,7 @@
</span><span class="cx">         ElementUpdate update;
</span><span class="cx">         update.style = element.renderStyle();
</span><span class="cx"> 
</span><del>-        bool shouldResolve = parent.change &gt;= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling;
</del><ins>+        bool shouldResolve = parent.change &gt;= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling || hasImplicitDisplayContents(element);
</ins><span class="cx">         if (shouldResolve) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">             CheckForVisibilityChangeOnRecalcStyle checkForVisibilityChange(&amp;element, element.renderStyle());
</span><span class="lines">@@ -627,21 +642,6 @@
</span><span class="cx">             element.clearNeedsStyleRecalc();
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
-        if (is&lt;HTMLSlotElement&gt;(element)) {
-            // FIXME: We should compute style for the slot and use it as parent style.
-            // Duplicate the style from the parent context.
-            ElementUpdate slotUpdate;
-            slotUpdate.style = parent.style.ptr();
-            slotUpdate.change = update.change;
-            if (!shouldResolve)
-                m_update-&gt;addElement(element, parent.element, update);
-            pushParent(element, slotUpdate);
-            it.traverseNext();
-            continue;
-        }
-#endif
</del><span class="cx">         if (!update.style) {
</span><span class="cx">             resetStyleForNonRenderedDescendants(element);
</span><span class="cx">             element.clearChildNeedsStyleRecalc();
</span></span></pre>
</div>
</div>

</body>
</html>