<!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>[190680] 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/190680">190680</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-10-07 12:59:32 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement :host pseudo class
https://bugs.webkit.org/show_bug.cgi?id=149440
Source/WebCore:
rdar://problem/22731953
Reviewed by Ryosuke Niwa.
This implements the basic non-function :host syntax.
* css/CSSSelector.cpp:
(WebCore::CSSSelector::selectorText):
* css/CSSSelector.h:
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::matchAuthorRules):
(WebCore::ElementRuleCollector::matchHostPseudoClassRules):
(WebCore::ElementRuleCollector::matchUserRules):
* css/ElementRuleCollector.h:
* css/RuleSet.cpp:
(WebCore::computeMatchBasedOnRuleHash):
(WebCore::RuleSet::addRule):
* css/RuleSet.h:
(WebCore::RuleSet::cuePseudoRules):
(WebCore::RuleSet::hostPseudoClassRules):
(WebCore::RuleSet::focusPseudoClassRules):
(WebCore::RuleSet::universalRules):
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
* css/SelectorPseudoClassAndCompatibilityElementMap.in:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
LayoutTests:
Reviewed by Ryosuke Niwa.
* fast/shadow-dom/css-scoping-shadow-host-rule.html:
Fix and expand the test case.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomcssscopingshadowhostrulehtml">trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-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="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.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="#trunkSourceWebCorecssRuleSeth">trunk/Source/WebCore/css/RuleSet.h</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorPseudoClassAndCompatibilityElementMapin">trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/LayoutTests/ChangeLog 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-07 Antti Koivisto <antti@apple.com>
+
+ Implement :host pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=149440
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/shadow-dom/css-scoping-shadow-host-rule.html:
+
+ Fix and expand the test case.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-10-07 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, more Mac test gardening after r190629.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomcssscopingshadowhostrulehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-rule.html (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-rule.html 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/LayoutTests/fast/shadow-dom/css-scoping-shadow-host-rule.html 2015-10-07 19:59:32 UTC (rev 190680)
</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>+ my-host, my-host2, my-host3, my-host4 {
</ins><span class="cx"> display: block;
</span><span class="cx"> width: 100px;
</span><del>- height: 50px;
</del><ins>+ height: 25px;
+ }
+ my-host2 {
+ background: green;
+ }
+ my-host3 {
</ins><span class="cx"> background: red;
</span><ins>+ color: green;
</ins><span class="cx"> }
</span><del>- good-host, other-good-host {
</del><ins>+ my-host4 {
</ins><span class="cx"> background: green;
</span><ins>+ color: green;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <p>Test passes if you see a single 100px by 100px green box below.</p>
</span><span class="cx"> <my-host>
</span><span class="cx"> <div>FAIL</div>
</span><span class="cx"> </my-host>
</span><ins>+ <my-host2>
+ <div>FAIL</div>
+ </my-host2>
+ <my-host3>
+ <div>FAIL</div>
+ </my-host3>
</ins><span class="cx"> <div class="container">
</span><del>- <good-host>
</del><ins>+ <my-host4>
</ins><span class="cx"> <div>FAIL</div>
</span><del>- </good-host>
</del><ins>+ </my-host4>
</ins><span class="cx"> </div>
</span><del>- <other-host id="bar" class="foo" name="baz">
- <div>FAIL</div>
- </other-host>
- <other-good-host>
- <div class="child">FAIL</div>
- </other-good-host>
</del><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> var shadowHost = document.querySelector('my-host');
</span><ins>+ var shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<style> :host { color: green; background: green; } </style><div>FAIL</div>';
+
+ shadowHost = document.querySelector('my-host2');
</ins><span class="cx"> shadowRoot = shadowHost.attachShadow({mode: 'open'});
</span><del>- shadowRoot.innerHTML = '<style> :host { background: green; } </style>';
</del><ins>+ shadowRoot.innerHTML = '<style> :host { color: red; background: red; } div { color: green }</style><div>FAIL</div>';
</ins><span class="cx">
</span><del>- shadowHost = document.querySelector('good-host');
</del><ins>+ shadowHost = document.querySelector('my-host3');
</ins><span class="cx"> shadowRoot = shadowHost.attachShadow({mode: 'open'});
</span><del>- shadowRoot.innerHTML = '<style> .container :host { background: red; } </style>';
</del><ins>+ shadowRoot.innerHTML = '<style> :host { background: green !important; color: green !important; } </style><div>FAIL</div>';
+
+ shadowHost = document.querySelector('my-host4');
+ shadowRoot = shadowHost.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<style> .container :host { background: red !important; } </style><div>FAIL</div>';
</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 (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -1325,7 +1325,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-rule.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/149440 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slotted-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slot-display-override.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/ChangeLog 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-10-07 Antti Koivisto <antti@apple.com>
+
+ Implement :host pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=149440
+ rdar://problem/22731953
+
+ Reviewed by Ryosuke Niwa.
+
+ This implements the basic non-function :host syntax.
+
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::matchAuthorRules):
+ (WebCore::ElementRuleCollector::matchHostPseudoClassRules):
+ (WebCore::ElementRuleCollector::matchUserRules):
+ * css/ElementRuleCollector.h:
+ * css/RuleSet.cpp:
+ (WebCore::computeMatchBasedOnRuleHash):
+ (WebCore::RuleSet::addRule):
+ * css/RuleSet.h:
+ (WebCore::RuleSet::cuePseudoRules):
+ (WebCore::RuleSet::hostPseudoClassRules):
+ (WebCore::RuleSet::focusPseudoClassRules):
+ (WebCore::RuleSet::universalRules):
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOne):
+ * css/SelectorPseudoClassAndCompatibilityElementMap.in:
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoClassType):
+
</ins><span class="cx"> 2015-10-07 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: ARIA 1.1 @aria-placeholder
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -632,6 +632,11 @@
</span><span class="cx"> case CSSSelector::PseudoClassWindowInactive:
</span><span class="cx"> str.appendLiteral(":window-inactive");
</span><span class="cx"> break;
</span><ins>+#if ENABLE(SHADOW_DOM)
+ case CSSSelector::PseudoClassHost:
+ str.appendLiteral(":host");
+ break;
+#endif
</ins><span class="cx"> case CSSSelector::PseudoClassUnknown:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/CSSSelector.h 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -159,6 +159,9 @@
</span><span class="cx"> PseudoClassDir,
</span><span class="cx"> PseudoClassRole,
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(SHADOW_DOM)
+ PseudoClassHost,
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum PseudoElementType {
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -188,6 +188,11 @@
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::matchAuthorRules(bool includeEmptyRules)
</span><span class="cx"> {
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (m_element.shadowRoot())
+ matchHostPseudoClassRules(includeEmptyRules);
+#endif
+
</ins><span class="cx"> clearMatchedRules();
</span><span class="cx"> m_result.ranges.lastAuthorRule = m_result.matchedProperties().size() - 1;
</span><span class="cx">
</span><span class="lines">@@ -200,6 +205,29 @@
</span><span class="cx"> sortAndTransferMatchedRules();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+void ElementRuleCollector::matchHostPseudoClassRules(bool includeEmptyRules)
+{
+ ASSERT(m_element.shadowRoot());
+ auto& shadowAuthorStyle = *m_element.shadowRoot()->styleResolver().ruleSets().authorStyle();
+ auto& shadowHostRules = shadowAuthorStyle.hostPseudoClassRules();
+ if (shadowHostRules.isEmpty())
+ return;
+
+ clearMatchedRules();
+ m_result.ranges.lastAuthorRule = m_result.matchedProperties().size() - 1;
+
+ auto ruleRange = m_result.ranges.authorRuleRange();
+ MatchRequest matchRequest(&shadowAuthorStyle, includeEmptyRules);
+ collectMatchingRulesForList(&shadowHostRules, matchRequest, ruleRange);
+
+ // We just sort the host rules before other author rules. This matches the current vague spec language
+ // but is not necessarily exactly what is needed.
+ // FIXME: Match the spec when it is finalized.
+ sortAndTransferMatchedRules();
+}
+#endif
+
</ins><span class="cx"> void ElementRuleCollector::matchUserRules(bool includeEmptyRules)
</span><span class="cx"> {
</span><span class="cx"> if (!m_ruleSets.userStyle())
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -77,6 +77,9 @@
</span><span class="cx"> void addElementStyleProperties(const StyleProperties*, bool isCacheable = true);
</span><span class="cx">
</span><span class="cx"> void matchUARules(RuleSet*);
</span><ins>+#if ENABLE(SHADOW_DOM)
+ void matchHostPseudoClassRules(bool includeEmptyRules);
+#endif
</ins><span class="cx">
</span><span class="cx"> void collectMatchingRules(const MatchRequest&, StyleResolver::RuleRange&);
</span><span class="cx"> void collectMatchingRulesForRegion(const MatchRequest&, StyleResolver::RuleRange&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -70,6 +70,10 @@
</span><span class="cx"> }
</span><span class="cx"> if (SelectorChecker::isCommonPseudoClassSelector(&selector))
</span><span class="cx"> return MatchBasedOnRuleHash::ClassB;
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (selector.match() == CSSSelector::PseudoClass && selector.pseudoClassType() == CSSSelector::PseudoClassHost)
+ return MatchBasedOnRuleHash::ClassB;
+#endif
</ins><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 class="lines">@@ -258,6 +262,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SHADOW_DOM)
+ if (selector->match() == CSSSelector::PseudoClass && selector->pseudoClassType() == CSSSelector::PseudoClassHost) {
+ m_hostPseudoClassRules.append(ruleData);
+ return;
+ }
+#endif
</ins><span class="cx"> if (selector->relation() != CSSSelector::SubSelector)
</span><span class="cx"> break;
</span><span class="cx"> selector = selector->tagHistory();
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.h (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.h 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/RuleSet.h 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -179,6 +179,9 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> const RuleDataVector* cuePseudoRules() const { return &m_cuePseudoRules; }
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(SHADOW_DOM)
+ const RuleDataVector& hostPseudoClassRules() const { return m_hostPseudoClassRules; }
+#endif
</ins><span class="cx"> const RuleDataVector* focusPseudoClassRules() const { return &m_focusPseudoClassRules; }
</span><span class="cx"> const RuleDataVector* universalRules() const { return &m_universalRules; }
</span><span class="cx">
</span><span class="lines">@@ -202,6 +205,9 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> RuleDataVector m_cuePseudoRules;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(SHADOW_DOM)
+ RuleDataVector m_hostPseudoClassRules;
+#endif
</ins><span class="cx"> RuleDataVector m_focusPseudoClassRules;
</span><span class="cx"> RuleDataVector m_universalRules;
</span><span class="cx"> Vector<StyleRulePage*> m_pageRules;
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -1013,7 +1013,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+#if ENABLE(SHADOW_DOM)
+ case CSSSelector::PseudoClassHost:
+ // :host matches based on context. Cases that reach selector checker don't match.
+ return false;
+#endif
</ins><span class="cx"> case CSSSelector::PseudoClassWindowInactive:
</span><span class="cx"> return isWindowInactive(element);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorPseudoClassAndCompatibilityElementMapin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -74,3 +74,7 @@
</span><span class="cx"> future
</span><span class="cx"> past
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(SHADOW_DOM)
+host
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (190679 => 190680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2015-10-07 19:41:28 UTC (rev 190679)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2015-10-07 19:59:32 UTC (rev 190680)
</span><span class="lines">@@ -819,7 +819,11 @@
</span><span class="cx">
</span><span class="cx"> return functionType;
</span><span class="cx"> }
</span><del>-
</del><ins>+#if ENABLE(SHADOW_DOM)
+ case CSSSelector::PseudoClassHost:
+ // :host matches based on context. Cases that reach selector checker don't match.
+ return FunctionType::CannotMatchAnything;
+#endif
</ins><span class="cx"> case CSSSelector::PseudoClassUnknown:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return FunctionType::CannotMatchAnything;
</span></span></pre>
</div>
</div>
</body>
</html>