Index: Source/core/css/resolver/ScopedStyleResolver.cpp |
diff --git a/Source/core/css/resolver/ScopedStyleResolver.cpp b/Source/core/css/resolver/ScopedStyleResolver.cpp |
index 740909a04d30f991b2a3f62eac7c03a35bd0c137..6fe45475d5fb768278ca36fde453017d9ef2bee9 100644 |
--- a/Source/core/css/resolver/ScopedStyleResolver.cpp |
+++ b/Source/core/css/resolver/ScopedStyleResolver.cpp |
@@ -143,31 +143,31 @@ |
} |
} |
-void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules) |
+void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder) |
{ |
ASSERT(!collector.scopeContainsLastMatchedElement()); |
collector.setScopeContainsLastMatchedElement(true); |
for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { |
ASSERT(m_authorStyleSheets[i]->ownerNode()); |
MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i); |
- collector.collectMatchingRules(matchRequest); |
+ collector.collectMatchingRules(matchRequest, cascadeOrder); |
} |
collector.setScopeContainsLastMatchedElement(false); |
} |
-void ScopedStyleResolver::collectMatchingShadowHostRules(ElementRuleCollector& collector, bool includeEmptyRules) |
+void ScopedStyleResolver::collectMatchingShadowHostRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder) |
{ |
ASSERT(!collector.scopeContainsLastMatchedElement()); |
collector.setScopeContainsLastMatchedElement(true); |
for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) { |
ASSERT(m_authorStyleSheets[i]->ownerNode()); |
MatchRequest matchRequest(&m_authorStyleSheets[i]->contents()->ruleSet(), includeEmptyRules, &m_scope->rootNode(), m_authorStyleSheets[i], i); |
- collector.collectMatchingShadowHostRules(matchRequest); |
+ collector.collectMatchingShadowHostRules(matchRequest, cascadeOrder); |
} |
collector.setScopeContainsLastMatchedElement(false); |
} |
-void ScopedStyleResolver::collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector& collector, bool includeEmptyRules) |
+void ScopedStyleResolver::collectMatchingTreeBoundaryCrossingRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder) |
{ |
if (!m_treeBoundaryCrossingRuleSet) |
return; |
@@ -177,7 +177,7 @@ |
for (const auto& rules : *m_treeBoundaryCrossingRuleSet) { |
MatchRequest request(rules->m_ruleSet.get(), includeEmptyRules, &treeScope().rootNode(), rules->m_parentStyleSheet, rules->m_parentIndex); |
- collector.collectMatchingRules(request, true); |
+ collector.collectMatchingRules(request, cascadeOrder, true); |
} |
collector.setScopeContainsLastMatchedElement(false); |