Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-03-22 23:32:48 +08:00
commit c277d761f3
159 changed files with 10753 additions and 13777 deletions

View file

@ -5649,6 +5649,7 @@ CSSParserImpl::ParseTypeOrUniversalSelector(int32_t& aDataMask,
aSelector.SetTag(mToken.mIdent);
}
else if (mToken.IsSymbol('*')) { // universal selector
aSelector.SetHasExplicitUniversal();
aDataMask |= SEL_MASK_ELEM;
// don't set tag
}
@ -5660,6 +5661,7 @@ CSSParserImpl::ParseTypeOrUniversalSelector(int32_t& aDataMask,
}
else { // was universal element selector
SetDefaultNamespaceOnSelector(aSelector);
aSelector.SetHasExplicitUniversal();
aDataMask |= SEL_MASK_ELEM;
// don't set any tag in the selector
}
@ -6105,7 +6107,8 @@ CSSParserImpl::ParsePseudoSelector(int32_t& aDataMask,
CSSPseudoClassType::negation == pseudoClassType ||
nsCSSPseudoClasses::HasStringArg(pseudoClassType) ||
nsCSSPseudoClasses::HasNthPairArg(pseudoClassType) ||
nsCSSPseudoClasses::HasSelectorListArg(pseudoClassType))) {
nsCSSPseudoClasses::HasSelectorListArg(pseudoClassType)) &&
!nsCSSPseudoClasses::HasOptionalSelectorListArg(pseudoClassType)) {
// There are no other function pseudos
REPORT_UNEXPECTED_TOKEN(PEPseudoSelNonFunc);
UngetToken();