wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2078 - Part 3: Rename nsCSSRuleProcessor::SelectorListMatches to RestrictedSelectorListMatches

Browse source 
This is in preparation for merging the logic of RestrictedSelectorListMatches and AnySelectorInArgListMatches.
This commit is contained in:
FranklinDM 2023-02-18 19:29:42 +08:00 • committed by roytam1
commit 14e8922dca
5 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dom/base/Element.cpp
View file

@ -3438,9 +3438,9 @@ Element::Closest(const nsAString& aSelector, ErrorResult& aResult)
matchingContext.AddScopeElement(this); matchingContext.AddScopeElement(this);
for (nsINode* node = this; node; node = node->GetParentNode()) { for (nsINode* node = this; node; node = node->GetParentNode()) {
if (node->IsElement() && if (node->IsElement() &&
nsCSSRuleProcessor::SelectorListMatches(node->AsElement(), nsCSSRuleProcessor::RestrictedSelectorListMatches(node->AsElement(),
matchingContext, matchingContext,
selectorList)) { selectorList)) {
return node->AsElement(); return node->AsElement();
} }
} }
@ -3464,8 +3464,9 @@ Element::Matches(const nsAString& aSelector, ErrorResult& aError)
TreeMatchContext::eNeverMatchVisited); TreeMatchContext::eNeverMatchVisited);
matchingContext.SetHasSpecifiedScope(); matchingContext.SetHasSpecifiedScope();
matchingContext.AddScopeElement(this); matchingContext.AddScopeElement(this);
return nsCSSRuleProcessor::SelectorListMatches(this, matchingContext, return nsCSSRuleProcessor::RestrictedSelectorListMatches(this,
selectorList); matchingContext,
selectorList);
} }
static const nsAttrValue::EnumTable kCORSAttributeTable[] = { static const nsAttrValue::EnumTable kCORSAttributeTable[] = {

12
dom/base/nsINode.cpp
View file

@ -2879,9 +2879,9 @@ FindMatchingElementsWithId(const nsAString& aId, nsINode* aRoot,
// We have an element with the right id and it's a strict descendant // We have an element with the right id and it's a strict descendant
// of aRoot. Make sure it really matches the selector. // of aRoot. Make sure it really matches the selector.
if (!aMatchInfo || if (!aMatchInfo ||
nsCSSRuleProcessor::SelectorListMatches(element, nsCSSRuleProcessor::RestrictedSelectorListMatches(element,
aMatchInfo->mMatchContext, aMatchInfo->mMatchContext,
aMatchInfo->mSelectorList)) { aMatchInfo->mSelectorList)) {
aList.AppendElement(element); aList.AppendElement(element);
if (onlyFirstMatch) { if (onlyFirstMatch) {
return; return;
@ -2932,9 +2932,9 @@ FindMatchingElements(nsINode* aRoot, nsCSSSelectorList* aSelectorList, T &aList,
cur; cur;
cur = cur->GetNextNode(aRoot)) { cur = cur->GetNextNode(aRoot)) {
if (cur->IsElement() && if (cur->IsElement() &&
nsCSSRuleProcessor::SelectorListMatches(cur->AsElement(), nsCSSRuleProcessor::RestrictedSelectorListMatches(cur->AsElement(),
matchingContext, matchingContext,
aSelectorList)) { aSelectorList)) {
if (onlyFirstMatch) { if (onlyFirstMatch) {
aList.AppendElement(cur->AsElement()); aList.AppendElement(cur->AsElement());
return; return;

7
layout/inspector/inDOMUtils.cpp
View file

@ -465,7 +465,7 @@ inDOMUtils::SelectorMatchesElement(nsIDOMElement* aElement,
} }
// We have a matching pseudo element, now remove it so we can compare // 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. // It's OK to do this - we just cloned sel and nothing else is using it.
sel->RemoveRightmostSelector(); sel->RemoveRightmostSelector();
} }
@ -476,8 +476,9 @@ inDOMUtils::SelectorMatchesElement(nsIDOMElement* aElement,
nsRuleWalker::eRelevantLinkUnvisited, nsRuleWalker::eRelevantLinkUnvisited,
element->OwnerDoc(), element->OwnerDoc(),
TreeMatchContext::eNeverMatchVisited); TreeMatchContext::eNeverMatchVisited);
*aMatches = nsCSSRuleProcessor::SelectorListMatches(element, matchingContext, *aMatches = nsCSSRuleProcessor::RestrictedSelectorListMatches(element,
sel); matchingContext,
sel);
return NS_OK; return NS_OK;
} }

10
layout/style/nsCSSRuleProcessor.cpp
View file

@ -1337,8 +1337,8 @@ struct NodeMatchContext {
// node being matched that is itself or an ancestor.) // node being matched that is itself or an ancestor.)
// //
// Always false when TreeMatchContext::mForStyling is false. (We // Always false when TreeMatchContext::mForStyling is false. (We
// could figure it out for SelectorListMatches, but we're starting // could figure it out for RestrictedSelectorListMatches, but we're
// from the middle of the selector list when doing // starting from the middle of the selector list when doing
// Has{Attribute,State}DependentStyle, so we can't tell. So when // Has{Attribute,State}DependentStyle, so we can't tell. So when
// mForStyling is false, we have to assume we don't know.) // mForStyling is false, we have to assume we don't know.)
const bool mIsRelevantLink; const bool mIsRelevantLink;
@ -4094,9 +4094,9 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
} }
/* static */ bool /* static */ bool
nsCSSRuleProcessor::SelectorListMatches(Element* aElement, nsCSSRuleProcessor::RestrictedSelectorListMatches(Element* aElement,
TreeMatchContext& aTreeMatchContext, TreeMatchContext& aTreeMatchContext,
nsCSSSelectorList* aSelectorList) nsCSSSelectorList* aSelectorList)
{ {
MOZ_ASSERT(!aTreeMatchContext.mForScopedStyle, MOZ_ASSERT(!aTreeMatchContext.mForScopedStyle,
"mCurrentStyleScope will need to be saved and restored after the " "mCurrentStyleScope will need to be saved and restored after the "

6
layout/style/nsCSSRuleProcessor.h
View file

@ -92,9 +92,9 @@ public:
* include any pseudo-element selectors. aSelectorList is allowed * include any pseudo-element selectors. aSelectorList is allowed
* to be null; in this case false will be returned. * to be null; in this case false will be returned.
*/ */
static bool SelectorListMatches(mozilla::dom::Element* aElement, static bool RestrictedSelectorListMatches(mozilla::dom::Element* aElement,
TreeMatchContext& aTreeMatchContext, TreeMatchContext& aTreeMatchContext,
nsCSSSelectorList* aSelectorList); nsCSSSelectorList* aSelectorList);
/* /*
* Helper to get the content state for a content node. This may be * Helper to get the content state for a content node. This may be