Index: Source/core/css/ElementRuleCollector.h |
diff --git a/Source/core/css/ElementRuleCollector.h b/Source/core/css/ElementRuleCollector.h |
index 2423b1f23b36bbed4fd76ff357d93a3f8c0d79ff..2235ad7f16de045c8c558421a3c27d6873a62c07 100644 |
--- a/Source/core/css/ElementRuleCollector.h |
+++ b/Source/core/css/ElementRuleCollector.h |
@@ -126,7 +126,7 @@ public: |
PassRefPtrWillBeRawPtr<StyleRuleList> matchedStyleRuleList(); |
PassRefPtrWillBeRawPtr<CSSRuleList> matchedCSSRuleList(); |
- void collectMatchingRules(const MatchRequest&, RuleRange&, SelectorChecker::BehaviorAtBoundary = SelectorChecker::DoesNotCrossBoundary, CascadeScope = ignoreCascadeScope, CascadeOrder = ignoreCascadeOrder); |
+ void collectMatchingRules(const MatchRequest&, RuleRange&, SelectorChecker::ContextFlags = SelectorChecker::DefaultBehavior, CascadeScope = ignoreCascadeScope, CascadeOrder = ignoreCascadeOrder); |
void sortAndTransferMatchedRules(); |
void clearMatchedRules(); |
void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true); |
@@ -136,19 +136,19 @@ public: |
void sortAndTransferMatchedRulesWithOnlySortBySpecificity(); |
private: |
- void collectRuleIfMatches(const RuleData&, SelectorChecker::BehaviorAtBoundary, CascadeScope, CascadeOrder, const MatchRequest&, RuleRange&); |
+ void collectRuleIfMatches(const RuleData&, SelectorChecker::ContextFlags, CascadeScope, CascadeOrder, const MatchRequest&, RuleRange&); |
template<typename RuleDataListType> |
- void collectMatchingRulesForList(const RuleDataListType* rules, SelectorChecker::BehaviorAtBoundary behaviorAtBoundary, CascadeScope cascadeScope, CascadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange) |
+ void collectMatchingRulesForList(const RuleDataListType* rules, SelectorChecker::ContextFlags contextFlags, CascadeScope cascadeScope, CascadeOrder cascadeOrder, const MatchRequest& matchRequest, RuleRange& ruleRange) |
{ |
if (!rules) |
return; |
for (typename RuleDataListType::const_iterator it = rules->begin(), end = rules->end(); it != end; ++it) |
- collectRuleIfMatches(*it, behaviorAtBoundary, cascadeScope, cascadeOrder, matchRequest, ruleRange); |
+ collectRuleIfMatches(*it, contextFlags, cascadeScope, cascadeOrder, matchRequest, ruleRange); |
} |
- bool ruleMatches(const RuleData&, const ContainerNode* scope, SelectorChecker::BehaviorAtBoundary, SelectorChecker::MatchResult*); |
+ bool ruleMatches(const RuleData&, const ContainerNode* scope, SelectorChecker::ContextFlags, SelectorChecker::MatchResult*); |
CSSRuleList* nestedRuleList(CSSRule*); |
template<class CSSRuleCollection> |