<!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>[199268] 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/199268">199268</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-09 00:38:32 -0700 (Sat, 09 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement functional :host() pseudo class
https://bugs.webkit.org/show_bug.cgi?id=156397
<rdar://problem/25621445>
Reviewed by Darin Adler.
Source/WebCore:
We already support :host. Add functional syntax too.
* css/CSSGrammar.y.in:
Parse functional :host().
* css/CSSParser.cpp:
(WebCore::CSSParser::detectFunctionTypeToken):
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::parsePseudoClassHostFunctionSelector):
* css/CSSParserValues.h:
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::matchedRuleList):
(WebCore::ElementRuleCollector::addMatchedRule):
Factor some shared code here.
(WebCore::ElementRuleCollector::matchHostPseudoClassRules):
Instead of using the generic paths use a :host specific code path for matching.
This makes it easier to avoid :host matching when it shouldn't.
(WebCore::ElementRuleCollector::collectMatchingRulesForList):
* css/ElementRuleCollector.h:
* css/RuleSet.cpp:
(WebCore::computeMatchBasedOnRuleHash):
:host is always handled by the special matching path.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::match):
(WebCore::SelectorChecker::matchHostPseudoClass):
Add a function specifically for checking :host. In always fails on the normal code paths.
Check the argument selector if provided.
(WebCore::hasScrollbarPseudoElement):
* css/SelectorChecker.h:
LayoutTests:
Enable, fix and expand the test.
* fast/shadow-dom/css-scoping-shadow-host-functional-rule.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowhostfunctionalrulehtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-functional-rule.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerh">trunk/Source/WebCore/css/SelectorChecker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/LayoutTests/ChangeLog 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-04-09 Antti Koivisto <antti@apple.com>
+
+ Implement functional :host() pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=156397
+ <rdar://problem/25621445>
+
+ Reviewed by Darin Adler.
+
+ Enable, fix and expand the test.
+
+ * fast/shadow-dom/css-scoping-shadow-host-functional-rule.html:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-04-07 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve IDL support for object arguments that are neither optional nor nullable
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowhostfunctionalrulehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-functional-rule.html (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-functional-rule.html 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-functional-rule.html 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -8,41 +8,56 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <style>
</span><del>- my-host, good-host, other-host, other-good-host {
</del><ins>+ host1, host2, host3, host4, host5 {
</ins><span class="cx"> display: block;
</span><span class="cx"> width: 100px;
</span><del>- height: 50px;
</del><ins>+ height: 20px;
</ins><span class="cx"> background: red;
</span><span class="cx"> }
</span><del>- good-host, other-good-host {
</del><ins>+ host3, host4, host5 {
</ins><span class="cx"> background: green;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>- <p>Test passes if you see a single 100px by 100px green box below.</p>
- <my-host>
</del><ins>+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <host1>
</ins><span class="cx"> <div>FAIL</div>
</span><del>- </my-host>
- <div class="container">
- <good-host>
- <div>FAIL</div>
- </good-host>
</del><ins>+ </host1>
+ <host2 id="bar" class="foo" name="baz">
+ <div>FAIL</div>
+ </host2>
+ <div>
+ <host3>
+ FAIL
+ </host3>
</ins><span class="cx"> </div>
</span><del>- <other-host id="bar" class="foo" name="baz">
</del><ins>+ <host4>
+ <div class="child">FAIL</div>
+ </host4>
+ <host5>
</ins><span class="cx"> <div>FAIL</div>
</span><del>- </other-host>
- <other-good-host>
- <div class="child">FAIL</div>
- </other-good-host>
</del><ins>+ </host5>
</ins><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- var shadowHost = document.querySelector('other-host');
</del><ins>+ var shadowHost = document.querySelector('host1');
</ins><span class="cx"> shadowRoot = shadowHost.attachShadow({mode: 'open'});
</span><del>- shadowRoot.innerHTML = '<style> :host(other-host.foo#bar[name=baz]) { background: green; } </style>';
</del><ins>+ shadowRoot.innerHTML = '<style> :host(host1) { background: green !important; } </style>';
</ins><span class="cx">
</span><del>- shadowHost = document.querySelector('other-good-host');
</del><ins>+ shadowHost = document.querySelector('host2');
</ins><span class="cx"> shadowRoot = shadowHost.attachShadow({mode: 'open'});
</span><del>- shadowRoot.innerHTML = '<style> :host(.child) { background: red; } </style>';
</del><ins>+ shadowRoot.innerHTML = '<style> :host(host2.foo#bar[name=baz]) { background: green !important; } </style>';
+
+ shadowHost = document.querySelector('host3');
+ shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<style> :host(div host3) { background: red !important; } </style>';
+
+ shadowHost = document.querySelector('host4');
+ shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<style> :host(.child) { background: red !important; } </style>';
+
+ shadowHost = document.querySelector('host5');
+ shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<style> :host(host1) { background: red !important; } </style>';
</ins><span class="cx"> } catch (exception) {
</span><span class="cx"> document.body.appendChild(document.createTextNode(exception));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -1224,7 +1224,6 @@
</span><span class="cx"> webkit.org/b/149128 fast/text/control-characters [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><del>-webkit.org/b/149440 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</del><span class="cx">
</span><span class="cx"> # Touch events is not enabled on Mac
</span><span class="cx"> webkit.org/b/149592 fast/shadow-dom/touch-event-ios.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/ChangeLog 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-04-09 Antti Koivisto <antti@apple.com>
+
+ Implement functional :host() pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=156397
+ <rdar://problem/25621445>
+
+ Reviewed by Darin Adler.
+
+ We already support :host. Add functional syntax too.
+
+ * css/CSSGrammar.y.in:
+
+ Parse functional :host().
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::detectFunctionTypeToken):
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::parsePseudoClassHostFunctionSelector):
+ * css/CSSParserValues.h:
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::matchedRuleList):
+ (WebCore::ElementRuleCollector::addMatchedRule):
+
+ Factor some shared code here.
+
+ (WebCore::ElementRuleCollector::matchHostPseudoClassRules):
+
+ Instead of using the generic paths use a :host specific code path for matching.
+ This makes it easier to avoid :host matching when it shouldn't.
+
+ (WebCore::ElementRuleCollector::collectMatchingRulesForList):
+ * css/ElementRuleCollector.h:
+ * css/RuleSet.cpp:
+ (WebCore::computeMatchBasedOnRuleHash):
+
+ :host is always handled by the special matching path.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::match):
+ (WebCore::SelectorChecker::matchHostPseudoClass):
+
+ Add a function specifically for checking :host. In always fails on the normal code paths.
+ Check the argument selector if provided.
+
+ (WebCore::hasScrollbarPseudoElement):
+ * css/SelectorChecker.h:
+
</ins><span class="cx"> 2016-04-07 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve IDL support for object arguments that are neither optional nor nullable
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -368,6 +368,7 @@
</span><span class="cx"> #if ENABLE_SHADOW_DOM
</span><span class="cx">
</span><span class="cx"> %token <string> SLOTTEDFUNCTION
</span><ins>+%token <string> HOSTFUNCTION
</ins><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1367,6 +1368,9 @@
</span><span class="cx"> | ':' ':' SLOTTEDFUNCTION maybe_space compound_selector maybe_space ')' {
</span><span class="cx"> $$ = CSSParserSelector::parsePseudoElementSlottedFunctionSelector($3, $5);
</span><span class="cx"> }
</span><ins>+ | ':' HOSTFUNCTION maybe_space compound_selector maybe_space ')' {
+ $$ = CSSParserSelector::parsePseudoClassHostFunctionSelector($2, $4);
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> // use by :-webkit-any.
</span><span class="cx"> // FIXME: should we support generic selectors here or just simple_selectors?
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -11897,6 +11897,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (isEqualToCSSIdentifier(name, "host")) {
+ m_token = HOSTFUNCTION;
+ return true;
+ }
+#endif
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> case 7:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -255,6 +255,30 @@
</span><span class="cx"> selector->adoptSelectorVector(*selectorVector);
</span><span class="cx"> return selector.release();
</span><span class="cx"> }
</span><ins>+
+CSSParserSelector* CSSParserSelector::parsePseudoClassHostFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector* parsedSelector)
+{
+ ASSERT_UNUSED(functionIdentifier, String(functionIdentifier) == "host(");
+
+ if (!parsedSelector)
+ return nullptr;
+
+ std::unique_ptr<CSSParserSelector> ownedParsedSelector(parsedSelector);
+
+ for (auto* component = parsedSelector; component; component = component->tagHistory()) {
+ if (component->matchesPseudoElement())
+ return nullptr;
+ }
+
+ auto selectorVector = std::make_unique<Vector<std::unique_ptr<CSSParserSelector>>>();
+ selectorVector->append(WTFMove(ownedParsedSelector));
+
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->m_selector->setMatch(CSSSelector::PseudoClass);
+ selector->m_selector->setPseudoClassType(CSSSelector::PseudoClassHost);
+ selector->adoptSelectorVector(*selectorVector);
+ return selector.release();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CSSParserSelector* CSSParserSelector::parsePseudoClassAndCompatibilityElementSelector(CSSParserString& pseudoTypeString)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.h (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.h 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -206,6 +206,7 @@
</span><span class="cx"> static CSSParserSelector* parsePseudoElementCueFunctionSelector(const CSSParserString& functionIdentifier, Vector<std::unique_ptr<CSSParserSelector>>*);
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> static CSSParserSelector* parsePseudoElementSlottedFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector*);
</span><ins>+ static CSSParserSelector* parsePseudoClassHostFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector*);
</ins><span class="cx"> #endif
</span><span class="cx"> static CSSParserSelector* parsePseudoClassAndCompatibilityElementSelector(CSSParserString& pseudoTypeString);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -107,9 +107,14 @@
</span><span class="cx"> return m_matchedRuleList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ElementRuleCollector::addMatchedRule(const MatchedRule& matchedRule)
</del><ins>+inline void ElementRuleCollector::addMatchedRule(const RuleData& ruleData, unsigned specificity, StyleResolver::RuleRange& ruleRange)
</ins><span class="cx"> {
</span><del>- m_matchedRules.append(matchedRule);
</del><ins>+ // Update our first/last rule indices in the matched rules array.
+ ++ruleRange.lastRuleIndex;
+ if (ruleRange.firstRuleIndex == -1)
+ ruleRange.firstRuleIndex = ruleRange.lastRuleIndex;
+
+ m_matchedRules.append({ &ruleData, specificity });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::clearMatchedRules()
</span><span class="lines">@@ -232,9 +237,19 @@
</span><span class="cx"> clearMatchedRules();
</span><span class="cx"> m_result.ranges.lastAuthorRule = m_result.matchedProperties().size() - 1;
</span><span class="cx">
</span><ins>+ SelectorChecker::CheckingContext context(m_mode);
+ SelectorChecker selectorChecker(m_element.document());
+
</ins><span class="cx"> auto ruleRange = m_result.ranges.authorRuleRange();
</span><del>- MatchRequest matchRequest(&shadowAuthorStyle, includeEmptyRules);
- collectMatchingRulesForList(&shadowHostRules, matchRequest, ruleRange);
</del><ins>+ for (auto& ruleData : shadowHostRules) {
+ if (ruleData.rule()->properties().isEmpty() && !includeEmptyRules)
+ continue;
+ auto& selector = *ruleData.selector();
+ unsigned specificity = 0;
+ if (!selectorChecker.matchHostPseudoClass(selector, m_element, context, specificity))
+ continue;
+ addMatchedRule(ruleData, specificity, ruleRange);
+ }
</ins><span class="cx">
</span><span class="cx"> // We just sort the host rules before other author rules. This matches the current vague spec language
</span><span class="cx"> // but is not necessarily exactly what is needed.
</span><span class="lines">@@ -486,15 +501,8 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> unsigned specificity;
</span><del>- if (ruleMatches(ruleData, specificity)) {
- // Update our first/last rule indices in the matched rules array.
- ++ruleRange.lastRuleIndex;
- if (ruleRange.firstRuleIndex == -1)
- ruleRange.firstRuleIndex = ruleRange.lastRuleIndex;
-
- // Add this rule to our list of matched rules.
- addMatchedRule({&ruleData, specificity});
- }
</del><ins>+ if (ruleMatches(ruleData, specificity))
+ addMatchedRule(ruleData, specificity, ruleRange);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> void sortMatchedRules();
</span><span class="cx"> void sortAndTransferMatchedRules();
</span><span class="cx">
</span><del>- void addMatchedRule(const MatchedRule&);
</del><ins>+ void addMatchedRule(const RuleData&, unsigned specificity, StyleResolver::RuleRange&);
</ins><span class="cx">
</span><span class="cx"> const Element& m_element;
</span><span class="cx"> const RuleSet& m_authorStyle;
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -70,10 +70,6 @@
</span><span class="cx"> }
</span><span class="cx"> if (SelectorChecker::isCommonPseudoClassSelector(&selector))
</span><span class="cx"> return MatchBasedOnRuleHash::ClassB;
</span><del>-#if ENABLE(SHADOW_DOM)
- if (selector.match() == CSSSelector::PseudoClass && selector.pseudoClassType() == CSSSelector::PseudoClassHost)
- return MatchBasedOnRuleHash::ClassB;
-#endif
</del><span class="cx"> if (selector.match() == CSSSelector::Id)
</span><span class="cx"> return MatchBasedOnRuleHash::ClassA;
</span><span class="cx"> if (selector.match() == CSSSelector::Class)
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -199,6 +199,25 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+bool SelectorChecker::matchHostPseudoClass(const CSSSelector& selector, const Element& element, CheckingContext& checkingContext, unsigned& specificity) const
+{
+ ASSERT(element.shadowRoot());
+ ASSERT(selector.match() == CSSSelector::PseudoClass && selector.pseudoClassType() == CSSSelector::PseudoClassHost);
+ ASSERT(checkingContext.resolvingMode != SelectorChecker::Mode::QueryingRules);
+ // :host doesn't combine with any other selectors.
+ if (selector.tagHistory())
+ return false;
+ specificity = selector.simpleSelectorSpecificity();
+ if (auto* selectorList = selector.selectorList()) {
+ LocalContext context(selector, element, VisitedMatchType::Enabled, NOPSEUDO);
+ unsigned ignoredSpecificity;
+ if (!matchSelectorList(checkingContext, context, element, *selectorList, ignoredSpecificity))
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> inline static bool hasScrollbarPseudoElement(const PseudoIdSet& dynamicPseudoIdSet)
</span><span class="cx"> {
</span><span class="cx"> PseudoIdSet scrollbarIdSet = { SCROLLBAR, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER };
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.h (199267 => 199268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.h 2016-04-09 05:16:59 UTC (rev 199267)
+++ trunk/Source/WebCore/css/SelectorChecker.h 2016-04-09 07:38:32 UTC (rev 199268)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx">
</span><span class="cx"> bool match(const CSSSelector&, const Element&, CheckingContext&, unsigned& specificity) const;
</span><span class="cx">
</span><ins>+ bool matchHostPseudoClass(const CSSSelector&, const Element&, CheckingContext&, unsigned& specificity) const;
+
</ins><span class="cx"> static bool isCommonPseudoClassSelector(const CSSSelector*);
</span><span class="cx"> static bool matchesFocusPseudoClass(const Element&);
</span><span class="cx"> static bool attributeSelectorMatches(const Element&, const QualifiedName&, const AtomicString& attributeValue, const CSSSelector&);
</span></span></pre>
</div>
</div>
</body>
</html>