wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 15:58:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2078 - Part 2: Rename nsPseudoClassList->u.mSelectors to mSelectorList

Browse source 
This makes it clear that we're accessing a selector list (nsCSSSelectorList), which is different from the selectors (nsCSSSelector) contained inside a selector list. Previously, both were confusingly referred to as mSelectors.
This commit is contained in:
FranklinDM 2023-02-18 11:05:36 +08:00 • committed by roytam1
commit 0648ec64bb
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
layout/style/StyleRule.cpp
View file

@ -153,7 +153,7 @@ nsPseudoClassList::nsPseudoClassList(CSSPseudoClassType aType,
"unexpected pseudo-class");
NS_ASSERTION(aSelectorList, "selector list expected");
MOZ_COUNT_CTOR(nsPseudoClassList);
u.mSelectors = aSelectorList;
u.mSelectorList = aSelectorList;
}
nsPseudoClassList*
@ -170,7 +170,7 @@ nsPseudoClassList::Clone(bool aDeep) const
NS_ASSERTION(nsCSSPseudoClasses::HasSelectorListArg(mType),
"unexpected pseudo-class");
// This constructor adopts its selector list argument.
result = new nsPseudoClassList(mType, u.mSelectors->Clone());
result = new nsPseudoClassList(mType, u.mSelectorList->Clone());
}
if (aDeep)
@ -199,7 +199,7 @@ nsPseudoClassList::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) cons
} else {
NS_ASSERTION(nsCSSPseudoClasses::HasSelectorListArg(p->mType),
"unexpected pseudo-class");
n += p->u.mSelectors->SizeOfIncludingThis(aMallocSizeOf);
n += p->u.mSelectorList->SizeOfIncludingThis(aMallocSizeOf);
}
p = p->mNext;
}
@ -210,7 +210,7 @@ nsPseudoClassList::~nsPseudoClassList(void)
{
MOZ_COUNT_DTOR(nsPseudoClassList);
if (nsCSSPseudoClasses::HasSelectorListArg(mType)) {
delete u.mSelectors;
delete u.mSelectorList;
} else if (u.mMemory) {
free(u.mMemory);
}
@ -927,7 +927,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
NS_ASSERTION(nsCSSPseudoClasses::HasSelectorListArg(list->mType),
"unexpected pseudo-class");
nsString tmp;
list->u.mSelectors->ToString(tmp, aSheet);
list->u.mSelectorList->ToString(tmp, aSheet);
aString.Append(tmp);
}
aString.Append(char16_t(')'));

2
layout/style/StyleRule.h
View file

@ -77,7 +77,7 @@ public:
void* mMemory; // mString and mNumbers use moz_xmalloc/free
char16_t* mString;
int32_t* mNumbers;
nsCSSSelectorList* mSelectors;
nsCSSSelectorList* mSelectorList;
} u;
CSSPseudoClassType mType;
nsPseudoClassList* mNext;

6
layout/style/nsCSSRuleProcessor.cpp
View file

@ -2395,7 +2395,7 @@ static bool AnySelectorInArgListMatches(Element* aElement,
bool aIsForgiving)
{
nsCSSSelectorList *l;
for (l = aList->u.mSelectors; l; l = l->mNext) {
for (l = aList->u.mSelectorList; l; l = l->mNext) {
nsCSSSelector *s = l->mSelectors;
if (s == nullptr) {
MOZ_ASSERT(aIsForgiving,
@ -2422,7 +2422,7 @@ HasPseudoClassSelectorArgsWithCombinators(nsCSSSelector* aSelector)
{
for (nsPseudoClassList* p = aSelector->mPseudoClassList; p; p = p->mNext) {
if (nsCSSPseudoClasses::HasSelectorListArg(p->mType)) {
for (nsCSSSelectorList* l = p->u.mSelectors; l; l = l->mNext) {
for (nsCSSSelectorList* l = p->u.mSelectorList; l; l = l->mNext) {
if (l->mSelectors->mNext) {
return true;
}
@ -3542,7 +3542,7 @@ AddSelector(RuleCascadeData* aCascade,
for (nsPseudoClassList* pseudoClass = negation->mPseudoClassList;
pseudoClass; pseudoClass = pseudoClass->mNext) {
if (nsCSSPseudoClasses::HasSelectorListArg(pseudoClass->mType)) {
for (nsCSSSelectorList *l = pseudoClass->u.mSelectors; l; l = l->mNext) {
for (nsCSSSelectorList *l = pseudoClass->u.mSelectorList; l; l = l->mNext) {
nsCSSSelector *s = l->mSelectors;
if (!AddSelector(aCascade, aSelectorInTopLevel, s,
aRightmostSelector)) {