From 14e8922dca72e69d4841ed6a421954f204d50fee Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Sat, 18 Feb 2023 19:29:42 +0800 Subject: [PATCH] Issue #2078 - Part 3: Rename nsCSSRuleProcessor::SelectorListMatches to RestrictedSelectorListMatches This is in preparation for merging the logic of RestrictedSelectorListMatches and AnySelectorInArgListMatches. --- dom/base/Element.cpp | 11 ++++++----- dom/base/nsINode.cpp | 12 ++++++------ layout/inspector/inDOMUtils.cpp | 7 ++++--- layout/style/nsCSSRuleProcessor.cpp | 10 +++++----- layout/style/nsCSSRuleProcessor.h | 6 +++--- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index f4ab994e87..99120db433 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -3438,9 +3438,9 @@ Element::Closest(const nsAString& aSelector, ErrorResult& aResult) matchingContext.AddScopeElement(this); for (nsINode* node = this; node; node = node->GetParentNode()) { if (node->IsElement() && - nsCSSRuleProcessor::SelectorListMatches(node->AsElement(), - matchingContext, - selectorList)) { + nsCSSRuleProcessor::RestrictedSelectorListMatches(node->AsElement(), + matchingContext, + selectorList)) { return node->AsElement(); } } @@ -3464,8 +3464,9 @@ Element::Matches(const nsAString& aSelector, ErrorResult& aError) TreeMatchContext::eNeverMatchVisited); matchingContext.SetHasSpecifiedScope(); matchingContext.AddScopeElement(this); - return nsCSSRuleProcessor::SelectorListMatches(this, matchingContext, - selectorList); + return nsCSSRuleProcessor::RestrictedSelectorListMatches(this, + matchingContext, + selectorList); } static const nsAttrValue::EnumTable kCORSAttributeTable[] = { diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp index db8986c4e8..749a3ee4a2 100644 --- a/dom/base/nsINode.cpp +++ b/dom/base/nsINode.cpp @@ -2879,9 +2879,9 @@ FindMatchingElementsWithId(const nsAString& aId, nsINode* aRoot, // We have an element with the right id and it's a strict descendant // of aRoot. Make sure it really matches the selector. if (!aMatchInfo || - nsCSSRuleProcessor::SelectorListMatches(element, - aMatchInfo->mMatchContext, - aMatchInfo->mSelectorList)) { + nsCSSRuleProcessor::RestrictedSelectorListMatches(element, + aMatchInfo->mMatchContext, + aMatchInfo->mSelectorList)) { aList.AppendElement(element); if (onlyFirstMatch) { return; @@ -2932,9 +2932,9 @@ FindMatchingElements(nsINode* aRoot, nsCSSSelectorList* aSelectorList, T &aList, cur; cur = cur->GetNextNode(aRoot)) { if (cur->IsElement() && - nsCSSRuleProcessor::SelectorListMatches(cur->AsElement(), - matchingContext, - aSelectorList)) { + nsCSSRuleProcessor::RestrictedSelectorListMatches(cur->AsElement(), + matchingContext, + aSelectorList)) { if (onlyFirstMatch) { aList.AppendElement(cur->AsElement()); return; diff --git a/layout/inspector/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp index 800201ce21..f2b52aed21 100644 --- a/layout/inspector/inDOMUtils.cpp +++ b/layout/inspector/inDOMUtils.cpp @@ -465,7 +465,7 @@ inDOMUtils::SelectorMatchesElement(nsIDOMElement* aElement, } // We have a matching pseudo element, now remove it so we can compare - // directly against |element| when proceeding into SelectorListMatches. + // directly against |element| when proceeding into RestrictedSelectorListMatches. // It's OK to do this - we just cloned sel and nothing else is using it. sel->RemoveRightmostSelector(); } @@ -476,8 +476,9 @@ inDOMUtils::SelectorMatchesElement(nsIDOMElement* aElement, nsRuleWalker::eRelevantLinkUnvisited, element->OwnerDoc(), TreeMatchContext::eNeverMatchVisited); - *aMatches = nsCSSRuleProcessor::SelectorListMatches(element, matchingContext, - sel); + *aMatches = nsCSSRuleProcessor::RestrictedSelectorListMatches(element, + matchingContext, + sel); return NS_OK; } diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index f15ab9de5c..667747b815 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -1337,8 +1337,8 @@ struct NodeMatchContext { // node being matched that is itself or an ancestor.) // // Always false when TreeMatchContext::mForStyling is false. (We - // could figure it out for SelectorListMatches, but we're starting - // from the middle of the selector list when doing + // could figure it out for RestrictedSelectorListMatches, but we're + // starting from the middle of the selector list when doing // Has{Attribute,State}DependentStyle, so we can't tell. So when // mForStyling is false, we have to assume we don't know.) const bool mIsRelevantLink; @@ -4094,9 +4094,9 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext) } /* static */ bool -nsCSSRuleProcessor::SelectorListMatches(Element* aElement, - TreeMatchContext& aTreeMatchContext, - nsCSSSelectorList* aSelectorList) +nsCSSRuleProcessor::RestrictedSelectorListMatches(Element* aElement, + TreeMatchContext& aTreeMatchContext, + nsCSSSelectorList* aSelectorList) { MOZ_ASSERT(!aTreeMatchContext.mForScopedStyle, "mCurrentStyleScope will need to be saved and restored after the " diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h index e207a71afe..af077f842b 100644 --- a/layout/style/nsCSSRuleProcessor.h +++ b/layout/style/nsCSSRuleProcessor.h @@ -92,9 +92,9 @@ public: * include any pseudo-element selectors. aSelectorList is allowed * to be null; in this case false will be returned. */ - static bool SelectorListMatches(mozilla::dom::Element* aElement, - TreeMatchContext& aTreeMatchContext, - nsCSSSelectorList* aSelectorList); + static bool RestrictedSelectorListMatches(mozilla::dom::Element* aElement, + TreeMatchContext& aTreeMatchContext, + nsCSSSelectorList* aSelectorList); /* * Helper to get the content state for a content node. This may be