wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1215424 - Convert ParseBoxProperty to CSSParseResult and remove ParseBoxPropertyVariant. r=heycam

Browse Source
This commit is contained in:
L. David Baron 2015-10-19 20:42:29 -07:00
parent 33c07bb675
commit 502a8c1923
1 changed files with 24 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
layout/style/nsCSSParser.cpp
View File

@ -782,21 +782,14 @@ protected:
bool ParseSingleValuePropertyByFunction(nsCSSValue& aValue,
nsCSSProperty aPropID);
// These are similar to ParseSingleValueProperty but only work for
// This is similar to ParseSingleValueProperty but only works for
// properties that are parsed with ParseBoxProperties or
// ParseGroupedBoxProperty. Stores in aConsumedTokens whether any tokens
// were consumed.
// ParseGroupedBoxProperty.
//
// Only works with variants with the following flags:
// A, C, H, K, L, N, P, CALC.
bool ParseBoxPropertyVariant(nsCSSValue& aValue,
uint32_t aVariantMask,
const KTableValue aKeywordTable[],
uint32_t aRestrictions,
bool& aConsumedTokens);
bool ParseBoxProperty(nsCSSValue& aValue,
nsCSSProperty aPropID,
bool& aConsumedTokens);
CSSParseResult ParseBoxProperty(nsCSSValue& aValue,
nsCSSProperty aPropID);
enum PriorityParsingStatus {
ePriority_None,
@ -9836,14 +9829,14 @@ CSSParserImpl::ParseBoxProperties(const nsCSSProperty aPropIDs[])
int32_t count = 0;
nsCSSRect result;
NS_FOR_CSS_SIDES (index) {
bool consumedTokens;
if (!ParseBoxProperty(result.*(nsCSSRect::sides[index]),
aPropIDs[index], consumedTokens)) {
if (consumedTokens) {
return false;
}
CSSParseResult parseResult =
ParseBoxProperty(result.*(nsCSSRect::sides[index]), aPropIDs[index]);
if (parseResult == CSSParseResult::NotFound) {
break;
}
if (parseResult == CSSParseResult::Error) {
return false;
}
count++;
}
if (count == 0) {
@ -9887,19 +9880,16 @@ CSSParserImpl::ParseGroupedBoxProperty(int32_t aVariantMask,
int32_t count = 0;
NS_FOR_CSS_SIDES (index) {
bool consumedTokens;
if (!ParseBoxPropertyVariant(result.*(nsCSSRect::sides[index]),
aVariantMask, nullptr,
CSS_PROPERTY_VALUE_NONNEGATIVE,
consumedTokens)) {
if (consumedTokens) {
// we consumed some tokens, which means we failed in the middle
// of parsing a multi-token value, and thus we shouldn't just
// exit the loop and return true
return false;
}
CSSParseResult parseResult =
ParseVariantWithRestrictions(result.*(nsCSSRect::sides[index]),
aVariantMask, nullptr,
CSS_PROPERTY_VALUE_NONNEGATIVE);
if (parseResult == CSSParseResult::NotFound) {
break;
}
if (parseResult == CSSParseResult::Error) {
return false;
}
count++;
}
@ -10501,42 +10491,13 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
#define BG_CLR (BG_CENTER | BG_LEFT | BG_RIGHT)
#define BG_LR (BG_LEFT | BG_RIGHT)
bool
CSSParserImpl::ParseBoxPropertyVariant(nsCSSValue& aValue,
uint32_t aVariantMask,
const KTableValue aKeywordTable[],
uint32_t aRestrictions,
bool& aConsumedTokens)
{
CSSParseResult result =
ParseVariantWithRestrictions(aValue, aVariantMask, aKeywordTable,
aRestrictions);
switch (result) {
case CSSParseResult::Ok:
aConsumedTokens = true;
return true;
case CSSParseResult::NotFound:
aConsumedTokens = false;
return false;
default:
MOZ_ASSERT_UNREACHABLE("invalid CSSParseResult value");
// fall through
case CSSParseResult::Error:
aConsumedTokens = true;
return false;
}
}
bool
CSSParseResult
CSSParserImpl::ParseBoxProperty(nsCSSValue& aValue,
nsCSSProperty aPropID,
bool& aConsumedTokens)
nsCSSProperty aPropID)
{
aConsumedTokens = false;
if (aPropID < 0 || aPropID >= eCSSProperty_COUNT_no_shorthands) {
MOZ_ASSERT(false, "must only be called for longhand properties");
return false;
return CSSParseResult::NotFound;
}
MOZ_ASSERT(!nsCSSProps::PropHasFlags(aPropID,
@ -10546,20 +10507,19 @@ CSSParserImpl::ParseBoxProperty(nsCSSValue& aValue,
uint32_t variant = nsCSSProps::ParserVariant(aPropID);
if (variant == 0) {
MOZ_ASSERT(false, "must only be called for variant-parsed properties");
return false;
return CSSParseResult::NotFound;
}
if (variant & ~(VARIANT_AHKLP | VARIANT_COLOR | VARIANT_CALC)) {
MOZ_ASSERT(false, "must only be called for properties that take certain "
"variants");
return false;
return CSSParseResult::NotFound;
}
const KTableValue* kwtable = nsCSSProps::kKeywordTableTable[aPropID];
uint32_t restrictions = nsCSSProps::ValueRestrictions(aPropID);
return ParseBoxPropertyVariant(aValue, variant, kwtable, restrictions,
aConsumedTokens);
return ParseVariantWithRestrictions(aValue, variant, kwtable, restrictions);
}
bool