diff options
| -rw-r--r-- | layout/style/StyleRule.cpp | 10 | ||||
| -rw-r--r-- | layout/style/StyleRule.h | 2 | ||||
| -rw-r--r-- | layout/style/nsCSSRuleProcessor.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index 30970dc5f1..3da69afb18 100644 --- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -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); } @@ -915,7 +915,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(')')); diff --git a/layout/style/StyleRule.h b/layout/style/StyleRule.h index dbf4e08406..d619b5090b 100644 --- a/layout/style/StyleRule.h +++ b/layout/style/StyleRule.h @@ -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; diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index 15838f411e..cccf881b26 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -2374,7 +2374,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, @@ -2401,7 +2401,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; } @@ -3519,7 +3519,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)) { |