<!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>[208390] 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/208390">208390</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-11-04 11:32:45 -0700 (Fri, 04 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>slotted() pseudo does not work with ID selector
https://bugs.webkit.org/show_bug.cgi?id=160538
<rdar://problem/28534529>
Reviewed by Andreas Kling.
Source/WebCore:
When we saw an id selector while addin rules we immediately threw it into the m_idRules
optimization bucket and bailed out. However selectors containing ::slotted must always end
up in m_slottedPseudoElementRules list no matter what else is there.
Fix by treating id like other selectors and only choosing the bucket after analysing all
the selector components.
Test: fast/shadow-dom/css-scoping-slot-with-id.html
* css/RuleSet.cpp:
(WebCore::RuleSet::addRule): Also made this use switch instead of a series of ifs.
LayoutTests:
* fast/shadow-dom/css-scoping-slot-with-id-expected.html: Added.
* fast/shadow-dom/css-scoping-slot-with-id.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="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingslotwithidexpectedhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingslotwithidhtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208389 => 208390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-04 18:10:24 UTC (rev 208389)
+++ trunk/LayoutTests/ChangeLog 2016-11-04 18:32:45 UTC (rev 208390)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-04 Antti Koivisto <antti@apple.com>
+
+ slotted() pseudo does not work with ID selector
+ https://bugs.webkit.org/show_bug.cgi?id=160538
+ <rdar://problem/28534529>
+
+ Reviewed by Andreas Kling.
+
+ * fast/shadow-dom/css-scoping-slot-with-id-expected.html: Added.
+ * fast/shadow-dom/css-scoping-slot-with-id.html: Added.
+
</ins><span class="cx"> 2016-11-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Use IDB-specific exceptions in places where the generic exceptions are currently used.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingslotwithidexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id-expected.html (0 => 208390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id-expected.html 2016-11-04 18:32:45 UTC (rev 208390)
</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="trunkLayoutTestsfastshadowdomcssscopingslotwithidhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id.html (0 => 208390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-slot-with-id.html 2016-11-04 18:32:45 UTC (rev 208390)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+my-host {
+ display: block;
+ width: 100px;
+ height: 25px;
+ background: red;
+}
+</style>
+</head>
+<body>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<my-host id="t1"><div id="host-child">text</div></my-host>
+<my-host id="t2"><div>text</div></my-host>
+<my-host id="t3"><div>text</div></my-host>
+<my-host id="t4"><div>text</div></my-host>
+
+<script>
+var host = document.querySelector('#t1');
+host.attachShadow({ mode: 'open' }).innerHTML = `
+ <style>
+ #myslot::slotted(#host-child) {
+ background-color: green; width: 100%; height: 100%;
+ }
+ </style>
+ <slot id="myslot" style="color:green"></slot>
+`;
+
+var host = document.querySelector('#t2');
+host.attachShadow({ mode: 'open' }).innerHTML = `
+ <style>
+ .myclass#myslot[style]::slotted(*) {
+ background-color: green; width: 100%; height: 100%;
+ }
+ #myslot::slotted(#not-my-host-child) {
+ background-color: red; width: 100%; height: 100%;
+ }
+ #notmyslot::slotted(*) {
+ background-color: red; width: 100%; height: 100%;
+ }
+ </style>
+ <slot class="myclass" id="myslot" style="color:green"></slot>
+`;
+
+var host = document.querySelector('#t3');
+host.attachShadow({ mode: 'open' }).innerHTML = `
+ <style>
+ ::slotted(*)#myslot {
+ background-color: green; width: 100%; height: 100%;
+ }
+ </style>
+ <slot id="myslot" style="color:green"></slot>
+`;
+
+var host = document.querySelector('#t4');
+var shadow = host.attachShadow({ mode: 'open' });
+shadow.innerHTML = `
+ <style>
+ #myslot::slotted(*) {
+ background-color: green; width: 100%; height: 100%;
+ }
+ </style>
+ <slot id="notmyslot" style="color:green"></slot>
+`;
+var slot = shadow.querySelector("#notmyslot");
+slot.offsetWidth;
+slot.setAttribute("id", "myslot");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208389 => 208390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-04 18:10:24 UTC (rev 208389)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 18:32:45 UTC (rev 208390)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-04 Antti Koivisto <antti@apple.com>
+
+ slotted() pseudo does not work with ID selector
+ https://bugs.webkit.org/show_bug.cgi?id=160538
+ <rdar://problem/28534529>
+
+ Reviewed by Andreas Kling.
+
+ When we saw an id selector while addin rules we immediately threw it into the m_idRules
+ optimization bucket and bailed out. However selectors containing ::slotted must always end
+ up in m_slottedPseudoElementRules list no matter what else is there.
+
+ Fix by treating id like other selectors and only choosing the bucket after analysing all
+ the selector components.
+
+ Test: fast/shadow-dom/css-scoping-slot-with-id.html
+
+ * css/RuleSet.cpp:
+ (WebCore::RuleSet::addRule): Also made this use switch instead of a series of ifs.
+
</ins><span class="cx"> 2016-11-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Handle IDBObjectStore rename behavior properly when version change transaction aborts.
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (208389 => 208390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2016-11-04 18:10:24 UTC (rev 208389)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2016-11-04 18:32:45 UTC (rev 208390)
</span><span class="lines">@@ -200,33 +200,22 @@
</span><span class="cx"> m_features.collectFeatures(ruleData);
</span><span class="cx">
</span><span class="cx"> unsigned classBucketSize = 0;
</span><ins>+ const CSSSelector* idSelector = nullptr;
</ins><span class="cx"> const CSSSelector* tagSelector = nullptr;
</span><span class="cx"> const CSSSelector* classSelector = nullptr;
</span><span class="cx"> const CSSSelector* linkSelector = nullptr;
</span><span class="cx"> const CSSSelector* focusSelector = nullptr;
</span><ins>+ const CSSSelector* customPseudoElementSelector = nullptr;
+ const CSSSelector* slottedPseudoElementSelector = nullptr;
+ const CSSSelector* cuePseudoElementSelector = nullptr;
</ins><span class="cx"> const CSSSelector* selector = ruleData.selector();
</span><span class="cx"> do {
</span><del>- if (selector->match() == CSSSelector::Id) {
- addToRuleSet(selector->value().impl(), m_idRules, ruleData);
- return;
- }
-
-#if ENABLE(VIDEO_TRACK)
- if (selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementCue) {
- m_cuePseudoRules.append(ruleData);
- return;
- }
-#endif
-
- if (selector->isCustomPseudoElement()) {
- // FIXME: Custom pseudo elements are handled by the shadow tree's selector filter. It doesn't know about the main DOM.
- ruleData.disableSelectorFiltering();
- addToRuleSet(selector->value().impl(), m_shadowPseudoElementRules, ruleData);
- return;
- }
-
- if (selector->match() == CSSSelector::Class) {
- AtomicStringImpl* className = selector->value().impl();
</del><ins>+ switch (selector->match()) {
+ case CSSSelector::Id:
+ idSelector = selector;
+ break;
+ case CSSSelector::Class: {
+ auto* className = selector->value().impl();
</ins><span class="cx"> if (!classSelector) {
</span><span class="cx"> classSelector = selector;
</span><span class="cx"> classBucketSize = rulesCountForName(m_classRules, className);
</span><span class="lines">@@ -237,12 +226,32 @@
</span><span class="cx"> classBucketSize = newClassBucketSize;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ break;
</ins><span class="cx"> }
</span><del>-
- if (selector->match() == CSSSelector::Tag && selector->tagQName().localName() != starAtom)
- tagSelector = selector;
-
- if (SelectorChecker::isCommonPseudoClassSelector(selector)) {
</del><ins>+ case CSSSelector::Tag:
+ if (selector->tagQName().localName() != starAtom)
+ tagSelector = selector;
+ break;
+ case CSSSelector::PseudoElement:
+ switch (selector->pseudoElementType()) {
+ case CSSSelector::PseudoElementUserAgentCustom:
+ case CSSSelector::PseudoElementWebKitCustom:
+ case CSSSelector::PseudoElementWebKitCustomLegacyPrefixed:
+ customPseudoElementSelector = selector;
+ break;
+ case CSSSelector::PseudoElementSlotted:
+ slottedPseudoElementSelector = selector;
+ break;
+#if ENABLE(VIDEO_TRACK)
+ case CSSSelector::PseudoElementCue:
+ cuePseudoElementSelector = selector;
+ break;
+#endif
+ default:
+ break;
+ }
+ break;
+ case CSSSelector::PseudoClass:
</ins><span class="cx"> switch (selector->pseudoClassType()) {
</span><span class="cx"> case CSSSelector::PseudoClassLink:
</span><span class="cx"> case CSSSelector::PseudoClassVisited:
</span><span class="lines">@@ -253,26 +262,53 @@
</span><span class="cx"> case CSSSelector::PseudoClassFocus:
</span><span class="cx"> focusSelector = selector;
</span><span class="cx"> break;
</span><ins>+ case CSSSelector::PseudoClassHost:
+ m_hostPseudoClassRules.append(ruleData);
+ return;
</ins><span class="cx"> default:
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ break;
+ case CSSSelector::Unknown:
+ case CSSSelector::Exact:
+ case CSSSelector::Set:
+ case CSSSelector::List:
+ case CSSSelector::Hyphen:
+ case CSSSelector::Contain:
+ case CSSSelector::Begin:
+ case CSSSelector::End:
+ case CSSSelector::PagePseudoClass:
+ break;
</ins><span class="cx"> }
</span><del>-
- if (selector->match() == CSSSelector::PseudoClass && selector->pseudoClassType() == CSSSelector::PseudoClassHost) {
- m_hostPseudoClassRules.append(ruleData);
- return;
- }
- if (selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementSlotted) {
- // ::slotted pseudo elements work accross shadow boundary making filtering difficult.
- ruleData.disableSelectorFiltering();
- m_slottedPseudoElementRules.append(ruleData);
- return;
- }
</del><span class="cx"> if (selector->relation() != CSSSelector::Subselector)
</span><span class="cx"> break;
</span><span class="cx"> selector = selector->tagHistory();
</span><span class="cx"> } while (selector);
</span><span class="cx">
</span><ins>+ if (cuePseudoElementSelector) {
+ m_cuePseudoRules.append(ruleData);
+ return;
+ }
+
+ if (slottedPseudoElementSelector) {
+ // ::slotted pseudo elements work accross shadow boundary making filtering difficult.
+ ruleData.disableSelectorFiltering();
+ m_slottedPseudoElementRules.append(ruleData);
+ return;
+ }
+
+ if (customPseudoElementSelector) {
+ // FIXME: Custom pseudo elements are handled by the shadow tree's selector filter. It doesn't know about the main DOM.
+ ruleData.disableSelectorFiltering();
+ addToRuleSet(customPseudoElementSelector->value().impl(), m_shadowPseudoElementRules, ruleData);
+ return;
+ }
+
+ if (idSelector) {
+ addToRuleSet(idSelector->value().impl(), m_idRules, ruleData);
+ return;
+ }
+
</ins><span class="cx"> if (classSelector) {
</span><span class="cx"> addToRuleSet(classSelector->value().impl(), m_classRules, ruleData);
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>