<!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>[197316] 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/197316">197316</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-02-29 00:36:53 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>::slotted doesn't work in nested shadow trees
https://bugs.webkit.org/show_bug.cgi?id=154765
<rdar://problem/24870995>
Reviewed by Ryosuke Niwa.
Source/WebCore:
See https://github.com/w3c/webcomponents/issues/331#issuecomment-189191593
Test: fast/shadow-dom/css-scoping-shadow-slotted-nested.html
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::matchSlottedPseudoElementRules):
Collect ::slotted rules from all the nested shadow trees instead of just the host's.
LayoutTests:
* fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html: Added.
* fast/shadow-dom/css-scoping-shadow-slotted-nested.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="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslottednestedexpectedhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowslottednestedhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197315 => 197316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-29 07:36:23 UTC (rev 197315)
+++ trunk/LayoutTests/ChangeLog 2016-02-29 08:36:53 UTC (rev 197316)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-28 Antti Koivisto <antti@apple.com>
+
+ ::slotted doesn't work in nested shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=154765
+ <rdar://problem/24870995>
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html: Added.
+ * fast/shadow-dom/css-scoping-shadow-slotted-nested.html: Added.
+
</ins><span class="cx"> 2016-02-28 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Switch to application/vnd.apple.folder for <attachment> folder special-case
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslottednestedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html (0 => 197316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested-expected.html 2016-02-29 08:36:53 UTC (rev 197316)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <div style="width: 100px; height: 100px; background: green;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowslottednestedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested.html (0 => 197316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-slotted-nested.html 2016-02-29 08:36:53 UTC (rev 197316)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Scoping - ::slotted pseudo element rule must apply to an element that got slotted via another slot</title>
+ <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+ <link rel="help" href="http://www.w3.org/TR/css-scoping-1/#selectors-data-model">
+ <link rel="match" href="reference/green-box.html"/>
+</head>
+<body>
+ <style>
+ outer-host {
+ display: block;
+ width: 100px;
+ height: 100px;
+ background: red;
+ }
+ outer-host > * {
+ display: block;
+ width: 100px;
+ height: 25px;
+ }
+ </style>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <outer-host>
+ <span slot="outer">FAIL1</span>
+ <span slot="inner">FAIL2</span>
+ <span slot="both">FAIL3</span>
+ </outer-host>
+ <template id="outer-host-template">
+ <inner-host>
+ <style>
+ ::slotted([slot=outer]) { background: green; color: green; }
+ ::slotted([slot=both]) { background: green; }
+ span { display: block; width: 100px; height: 25px; }
+ </style>
+ <slot name="outer"></slot>
+ <slot name="inner"></slot>
+ <slot name="both"></slot>
+ <span slot="inner">FAIL4</span>
+ </inner-host>
+ </template>
+ <template id="inner-host-template">
+ <style>
+ ::slotted([slot=inner]) { background: green; color: green; }
+ ::slotted([slot=both]) { color: green; }
+ </style>
+ <slot></slot>
+ <slot name="inner"></slot>
+ </template>
+ <script>
+
+ try {
+ var outerHost = document.querySelector('outer-host');
+ outerShadow = outerHost.attachShadow({mode: 'closed'});
+ outerShadow.appendChild(document.getElementById('outer-host-template').content.cloneNode(true));
+
+ var innerHost = outerShadow.querySelector('inner-host');
+ innerShadow = innerHost.attachShadow({mode: 'closed'});
+ innerShadow.appendChild(document.getElementById('inner-host-template').content.cloneNode(true));
+ } catch (exception) {
+ document.body.appendChild(document.createTextNode(exception));
+ }
+
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197315 => 197316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-29 07:36:23 UTC (rev 197315)
+++ trunk/Source/WebCore/ChangeLog 2016-02-29 08:36:53 UTC (rev 197316)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-28 Antti Koivisto <antti@apple.com>
+
+ ::slotted doesn't work in nested shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=154765
+ <rdar://problem/24870995>
+
+ Reviewed by Ryosuke Niwa.
+
+ See https://github.com/w3c/webcomponents/issues/331#issuecomment-189191593
+
+ Test: fast/shadow-dom/css-scoping-shadow-slotted-nested.html
+
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::matchSlottedPseudoElementRules):
+
+ Collect ::slotted rules from all the nested shadow trees instead of just the host's.
+
</ins><span class="cx"> 2016-02-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Parse HTMLOLElement.start as per the HTML spec
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (197315 => 197316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-02-29 07:36:23 UTC (rev 197315)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-02-29 08:36:53 UTC (rev 197316)
</span><span class="lines">@@ -249,18 +249,24 @@
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::matchSlottedPseudoElementRules(bool includeEmptyRules)
</span><span class="cx"> {
</span><del>- auto* hostShadowRoot = m_element.parentNode()->shadowRoot();
- ASSERT(hostShadowRoot);
- auto* slot = hostShadowRoot->findAssignedSlot(m_element);
- if (!slot)
- return;
- auto* shadowAuthorStyle = hostShadowRoot->styleResolver().ruleSets().authorStyle();
- if (!shadowAuthorStyle)
- return;
- // Find out if there are any ::slotted rules in the shadow tree matching the current slot.
- // FIXME: This is really part of the slot style and could be cached when resolving it.
- ElementRuleCollector collector(*slot, *shadowAuthorStyle, nullptr);
- auto slottedPseudoElementRules = collector.collectSlottedPseudoElementRulesForSlot(includeEmptyRules);
</del><ins>+ RuleSet::RuleDataVector slottedPseudoElementRules;
+
+ auto* maybeSlotted = &m_element;
+ for (auto* hostShadowRoot = m_element.parentNode()->shadowRoot(); hostShadowRoot; hostShadowRoot = maybeSlotted->parentNode()->shadowRoot()) {
+ auto* slot = hostShadowRoot->findAssignedSlot(*maybeSlotted);
+ if (!slot)
+ break;
+ // In nested case the slot may itself be assigned to a slot. Collect ::slotted rules from all the nested trees.
+ maybeSlotted = slot;
+ auto* shadowAuthorStyle = hostShadowRoot->styleResolver().ruleSets().authorStyle();
+ if (!shadowAuthorStyle)
+ continue;
+ // Find out if there are any ::slotted rules in the shadow tree matching the current slot.
+ // FIXME: This is really part of the slot style and could be cached when resolving it.
+ ElementRuleCollector collector(*slot, *shadowAuthorStyle, nullptr);
+ slottedPseudoElementRules.appendVector(collector.collectSlottedPseudoElementRulesForSlot(includeEmptyRules));
+ }
+
</ins><span class="cx"> if (slottedPseudoElementRules.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>