Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(675)

Unified Diff: Source/core/css/resolver/ScopedStyleResolver.cpp

Issue 313303002: Change shadow style's scope from Shadow Host to Shadow Root (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix merge failure Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ScopedStyleResolver.cpp
diff --git a/Source/core/css/resolver/ScopedStyleResolver.cpp b/Source/core/css/resolver/ScopedStyleResolver.cpp
index 3206b9639b9830e9a691f17a61e70b6bbd623049..7aea947d29f22752782d2655c7e800600e2611e4 100644
--- a/Source/core/css/resolver/ScopedStyleResolver.cpp
+++ b/Source/core/css/resolver/ScopedStyleResolver.cpp
@@ -120,10 +120,8 @@ void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& colle
if (!applyAuthorStyles)
behaviorAtBoundary |= SelectorChecker::ScopeContainsLastMatchedElement;
- if (m_scopingNode.isShadowRoot()) {
- scopingNode = toShadowRoot(m_scopingNode).host();
- behaviorAtBoundary |= SelectorChecker::ScopeIsShadowHost;
- }
+ if (m_scopingNode.isShadowRoot())
+ behaviorAtBoundary |= SelectorChecker::ScopeIsShadowRoot;
RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
« no previous file with comments | « Source/core/css/resolver/ScopedStyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698