Index: Source/core/css/resolver/ScopedStyleResolver.cpp |
diff --git a/Source/core/css/resolver/ScopedStyleResolver.cpp b/Source/core/css/resolver/ScopedStyleResolver.cpp |
index 684a888226b43b602bc48d34737a34672b19e846..7c3911146e6d1783d1d9e2cda372c6a51eca9229 100644 |
--- a/Source/core/css/resolver/ScopedStyleResolver.cpp |
+++ b/Source/core/css/resolver/ScopedStyleResolver.cpp |
@@ -121,17 +121,12 @@ void ScopedStyleResolver::addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyfr |
} |
} |
-void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, bool applyAuthorStyles, CascadeScope cascadeScope, CascadeOrder cascadeOrder) |
+void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, bool isInShadowTree, CascadeScope cascadeScope, CascadeOrder cascadeOrder) |
{ |
- unsigned contextFlags = SelectorChecker::DefaultBehavior; |
- |
- if (!applyAuthorStyles) |
- contextFlags |= SelectorChecker::ScopeContainsLastMatchedElement; |
- |
RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange(); |
for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { |
- MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], applyAuthorStyles, i); |
- collector.collectMatchingRules(matchRequest, ruleRange, static_cast<SelectorChecker::ContextFlags>(contextFlags), cascadeScope, cascadeOrder); |
+ MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i, isInShadowTree); |
+ collector.collectMatchingRules(matchRequest, ruleRange, cascadeScope, cascadeOrder); |
} |
} |