Revert 201092 "Reland of moved unused CascadeOrder. (patchset #1..."

trunk/Source/core/css/resolver/ScopedStyleResolver.cpp

Index: trunk/Source/core/css/resolver/ScopedStyleResolver.cpp
===================================================================
--- trunk/Source/core/css/resolver/ScopedStyleResolver.cpp	(revision 201870)
+++ trunk/Source/core/css/resolver/ScopedStyleResolver.cpp	(working copy)
@@ -143,7 +143,7 @@
     }
 }
 
-void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules)
+void ScopedStyleResolver::collectMatchingAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules, CascadeOrder cascadeOrder)
 {
     ASSERT(!collector.scopeContainsLastMatchedElement());
     collector.setScopeContainsLastMatchedElement(true);
@@ -150,12 +150,12 @@
     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);
@@ -162,12 +162,12 @@
     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);