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 1224464 patch 3 - Rename KTableValue to KTableEntry now that it is a struct. r=heycam

Browse Source
This commit is contained in:
L. David Baron 2015-11-19 18:09:07 -08:00
parent dac55b2eae
commit 0d43e5d74f
8 changed files with 370 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/inspector/inDOMUtils.cpp
View File

@ -577,7 +577,7 @@ static void GetKeywordsForProperty(const nsCSSProperty aProperty,
// Shorthand props have no keywords.
return;
}
const nsCSSProps::KTableValue *keywordTable =
const nsCSSProps::KTableEntry* keywordTable =
nsCSSProps::kKeywordTableTable[aProperty];
if (keywordTable) {
for (size_t i = 0; keywordTable[i].mKeyword != eCSSKeyword_UNKNOWN; ++i) {

62
layout/style/nsCSSParser.cpp
View File

@ -53,7 +53,7 @@
using namespace mozilla;
typedef nsCSSProps::KTableValue KTableValue;
typedef nsCSSProps::KTableEntry KTableEntry;
// pref-backed bool values (hooked up in nsCSSParser::Startup)
static bool sOpentypeSVGEnabled;
@ -791,7 +791,7 @@ protected:
// property (like "display") for which we emulate a vendor-prefixed value
// (like "-webkit-box").
nsCSSKeyword LookupKeywordPrefixAware(nsAString& aKeywordStr,
const KTableValue aKeywordTable[]);
const KTableEntry aKeywordTable[]);
bool ShouldUseUnprefixingService() const;
bool ParsePropertyWithUnprefixingService(const nsAString& aPropertyName,
@ -964,7 +964,7 @@ protected:
// parsing 'align/justify-items/self' from the css-align spec
bool ParseAlignJustifyPosition(nsCSSValue& aResult,
const KTableValue aTable[]);
const KTableEntry aTable[]);
bool ParseJustifyItems();
bool ParseAlignItemsSelfJustifySelf(nsCSSProperty aPropID);
// parsing 'align/justify-content' from the css-align spec
@ -984,7 +984,7 @@ protected:
bool MergeBitmaskValue(int32_t aNewValue, const int32_t aMasks[],
int32_t& aMergedValue);
bool ParseBitmaskValues(nsCSSValue& aValue,
const KTableValue aKeywordTable[],
const KTableEntry aKeywordTable[],
const int32_t aMasks[]);
bool ParseFontVariantEastAsian(nsCSSValue& aValue);
bool ParseFontVariantLigatures(nsCSSValue& aValue);
@ -1008,7 +1008,7 @@ protected:
bool ParsePadding();
bool ParseQuotes();
bool ParseTextAlign(nsCSSValue& aValue,
const KTableValue aTable[]);
const KTableEntry aTable[]);
bool ParseTextAlign(nsCSSValue& aValue);
bool ParseTextAlignLast(nsCSSValue& aValue);
bool ParseTextDecoration();
@ -1119,28 +1119,28 @@ protected:
bool ParseColorOpacity(uint8_t& aOpacity);
bool ParseColorOpacity(float& aOpacity);
bool ParseEnum(nsCSSValue& aValue,
const KTableValue aKeywordTable[]);
const KTableEntry aKeywordTable[]);
// Variant parsing methods
CSSParseResult ParseVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[]);
const KTableEntry aKeywordTable[]);
CSSParseResult ParseVariantWithRestrictions(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[],
const KTableEntry aKeywordTable[],
uint32_t aRestrictions);
CSSParseResult ParseNonNegativeVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[]);
const KTableEntry aKeywordTable[]);
CSSParseResult ParseOneOrLargerVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[]);
const KTableEntry aKeywordTable[]);
// Variant parsing methods that are guaranteed to UngetToken any token
// consumed on failure
bool ParseSingleTokenVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
MOZ_ASSERT(!(aVariantMask & VARIANT_MULTIPLE_TOKENS),
"use ParseVariant for variants in VARIANT_MULTIPLE_TOKENS");
@ -1151,7 +1151,7 @@ protected:
bool ParseSingleTokenVariantWithRestrictions(
nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[],
const KTableEntry aKeywordTable[],
uint32_t aRestrictions)
{
MOZ_ASSERT(!(aVariantMask & VARIANT_MULTIPLE_TOKENS),
@ -1165,7 +1165,7 @@ protected:
}
bool ParseSingleTokenNonNegativeVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
MOZ_ASSERT(!(aVariantMask & VARIANT_MULTIPLE_TOKENS),
"use ParseNonNegativeVariant for variants in "
@ -1177,7 +1177,7 @@ protected:
}
bool ParseSingleTokenOneOrLargerVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
MOZ_ASSERT(!(aVariantMask & VARIANT_MULTIPLE_TOKENS),
"use ParseOneOrLargerVariant for variants in "
@ -1209,12 +1209,12 @@ protected:
// that ends with a eCSSKeyword_UNKNOWN marker.
//
// |aPropertyKTable| can be used if some of the keywords to exclude
// also appear in an existing nsCSSProps::KTableValue,
// also appear in an existing nsCSSProps::KTableEntry,
// to avoid duplicating them.
bool ParseCustomIdent(nsCSSValue& aValue,
const nsAutoString& aIdentValue,
const nsCSSKeyword aExcludedKeywords[] = nullptr,
const nsCSSProps::KTableValue aPropertyKTable[] = nullptr);
const nsCSSProps::KTableEntry aPropertyKTable[] = nullptr);
bool ParseCounter(nsCSSValue& aValue);
bool ParseAttr(nsCSSValue& aValue);
bool ParseSymbols(nsCSSValue& aValue);
@ -6807,7 +6807,7 @@ CSSParserImpl::ParseTreePseudoElement(nsAtomList **aPseudoElementArgs)
nsCSSKeyword
CSSParserImpl::LookupKeywordPrefixAware(nsAString& aKeywordStr,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(aKeywordStr);
@ -7219,7 +7219,7 @@ static const nsCSSProperty kColumnRuleIDs[] = {
bool
CSSParserImpl::ParseEnum(nsCSSValue& aValue,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
nsSubstring* ident = NextIdent();
if (nullptr == ident) {
@ -7364,7 +7364,7 @@ CSSParserImpl::TranslateDimension(nsCSSValue& aValue,
CSSParseResult
CSSParserImpl::ParseVariantWithRestrictions(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[],
const KTableEntry aKeywordTable[],
uint32_t aRestrictions)
{
switch (aRestrictions) {
@ -7386,7 +7386,7 @@ CSSParserImpl::ParseVariantWithRestrictions(nsCSSValue& aValue,
CSSParseResult
CSSParserImpl::ParseNonNegativeVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
// The variant mask must only contain non-numeric variants or the ones
// that we specifically handle.
@ -7428,7 +7428,7 @@ CSSParserImpl::ParseNonNegativeVariant(nsCSSValue& aValue,
CSSParseResult
CSSParserImpl::ParseOneOrLargerVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
// The variant mask must only contain non-numeric variants or the ones
// that we specifically handle.
@ -7458,7 +7458,7 @@ CSSParserImpl::ParseOneOrLargerVariant(nsCSSValue& aValue,
CSSParseResult
CSSParserImpl::ParseVariant(nsCSSValue& aValue,
int32_t aVariantMask,
const KTableValue aKeywordTable[])
const KTableEntry aKeywordTable[])
{
NS_ASSERTION(!(mHashlessColorQuirk && (aVariantMask & VARIANT_COLOR)) ||
!(aVariantMask & VARIANT_NUMBER),
@ -7764,7 +7764,7 @@ bool
CSSParserImpl::ParseCustomIdent(nsCSSValue& aValue,
const nsAutoString& aIdentValue,
const nsCSSKeyword aExcludedKeywords[],
const nsCSSProps::KTableValue aPropertyKTable[])
const nsCSSProps::KTableEntry aPropertyKTable[])
{
nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(aIdentValue);
if (keyword == eCSSKeyword_UNKNOWN) {
@ -9459,7 +9459,7 @@ CSSParserImpl::ParseGridGap()
// $aTable is for <content-position> or <self-position>
bool
CSSParserImpl::ParseAlignJustifyPosition(nsCSSValue& aResult,
const KTableValue aTable[])
const KTableEntry aTable[])
{
nsCSSValue pos, overflowPos;
int32_t value = 0;
@ -10804,7 +10804,7 @@ CSSParserImpl::ParseBoxProperty(nsCSSValue& aValue,
return CSSParseResult::NotFound;
}
const KTableValue* kwtable = nsCSSProps::kKeywordTableTable[aPropID];
const KTableEntry* kwtable = nsCSSProps::kKeywordTableTable[aPropID];
uint32_t restrictions = nsCSSProps::ValueRestrictions(aPropID);
return ParseVariantWithRestrictions(aValue, variant, kwtable, restrictions);
@ -10910,7 +10910,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
return CSSParseResult::NotFound;
}
const KTableValue* kwtable = nsCSSProps::kKeywordTableTable[aPropID];
const KTableEntry* kwtable = nsCSSProps::kKeywordTableTable[aPropID];
uint32_t restrictions = nsCSSProps::ValueRestrictions(aPropID);
return ParseVariantWithRestrictions(aValue, variant, kwtable, restrictions);
}
@ -12539,7 +12539,7 @@ CSSParserImpl::ParseContent()
{
// We need to divide the 'content' keywords into two classes for
// ParseVariant's sake, so we can't just use nsCSSProps::kContentKTable.
static const KTableValue kContentListKWs[] = {
static const KTableEntry kContentListKWs[] = {
{ eCSSKeyword_open_quote, NS_STYLE_CONTENT_OPEN_QUOTE },
{ eCSSKeyword_close_quote, NS_STYLE_CONTENT_CLOSE_QUOTE },
{ eCSSKeyword_no_open_quote, NS_STYLE_CONTENT_NO_OPEN_QUOTE },
@ -12547,7 +12547,7 @@ CSSParserImpl::ParseContent()
{ eCSSKeyword_UNKNOWN, -1 }
};
static const KTableValue kContentSolitaryKWs[] = {
static const KTableEntry kContentSolitaryKWs[] = {
{ eCSSKeyword__moz_alt_content, NS_STYLE_CONTENT_ALT_CONTENT },
{ eCSSKeyword_UNKNOWN, -1 }
};
@ -13032,7 +13032,7 @@ CSSParserImpl::MergeBitmaskValue(int32_t aNewValue,
bool
CSSParserImpl::ParseBitmaskValues(nsCSSValue& aValue,
const KTableValue aKeywordTable[],
const KTableEntry aKeywordTable[],
const int32_t aMasks[])
{
// Parse at least one keyword
@ -14010,7 +14010,7 @@ CSSParserImpl::ParseTextDecoration()
}
bool
CSSParserImpl::ParseTextAlign(nsCSSValue& aValue, const KTableValue aTable[])
CSSParserImpl::ParseTextAlign(nsCSSValue& aValue, const KTableEntry aTable[])
{
if (ParseSingleTokenVariant(aValue, VARIANT_INHERIT, nullptr)) {
// 'inherit', 'initial' and 'unset' must be alone
@ -15689,7 +15689,7 @@ CSSParserImpl::ParsePaintOrder()
((1 << NS_STYLE_PAINT_ORDER_BITWIDTH) > NS_STYLE_PAINT_ORDER_LAST_VALUE,
"bitfield width insufficient for paint-order constants");
static const KTableValue kPaintOrderKTable[] = {
static const KTableEntry kPaintOrderKTable[] = {
{ eCSSKeyword_normal, NS_STYLE_PAINT_ORDER_NORMAL },
{ eCSSKeyword_fill, NS_STYLE_PAINT_ORDER_FILL },
{ eCSSKeyword_stroke, NS_STYLE_PAINT_ORDER_STROKE },

320
layout/style/nsCSSProps.cpp
View File

File diff suppressed because it is too large Load Diff

336
layout/style/nsCSSProps.h
View File

@ -307,7 +307,7 @@ enum nsStyleAnimType {
class nsCSSProps {
public:
struct KTableValue {
struct KTableEntry {
nsCSSKeyword mKeyword;
int16_t mValue;
};
@ -390,22 +390,22 @@ public:
// otherwise, returns -1.
// NOTE: Generally, clients should call FindKeyword() instead of this method.
static int32_t FindIndexOfKeyword(nsCSSKeyword aKeyword,
const KTableValue aTable[]);
const KTableEntry aTable[]);
// Find |aKeyword| in |aTable|, if found set |aValue| to its corresponding value.
// If not found, return false and do not set |aValue|.
static bool FindKeyword(nsCSSKeyword aKeyword, const KTableValue aTable[],
static bool FindKeyword(nsCSSKeyword aKeyword, const KTableEntry aTable[],
int32_t& aValue);
// Return the first keyword in |aTable| that has the corresponding value |aValue|.
// Return |eCSSKeyword_UNKNOWN| if not found.
static nsCSSKeyword ValueToKeywordEnum(int32_t aValue,
const KTableValue aTable[]);
const KTableEntry aTable[]);
// Ditto but as a string, return "" when not found.
static const nsAFlatCString& ValueToKeyword(int32_t aValue,
const KTableValue aTable[]);
const KTableEntry aTable[]);
static const nsStyleStructID kSIDTable[eCSSProperty_COUNT_no_shorthands];
static const KTableValue* const kKeywordTableTable[eCSSProperty_COUNT_no_shorthands];
static const KTableEntry* const kKeywordTableTable[eCSSProperty_COUNT_no_shorthands];
static const nsStyleAnimType kAnimTypeTable[eCSSProperty_COUNT_no_shorthands];
static const ptrdiff_t
kStyleStructOffsetTable[eCSSProperty_COUNT_no_shorthands];
@ -630,180 +630,180 @@ public:
if (nsCSSProps::IsEnabled(*it_, (nsCSSProps::EnabledState) es_))
// Keyword/Enum value tables
static const KTableValue kAnimationDirectionKTable[];
static const KTableValue kAnimationFillModeKTable[];
static const KTableValue kAnimationIterationCountKTable[];
static const KTableValue kAnimationPlayStateKTable[];
static const KTableValue kAnimationTimingFunctionKTable[];
static const KTableValue kAppearanceKTable[];
static const KTableValue kAzimuthKTable[];
static const KTableValue kBackfaceVisibilityKTable[];
static const KTableValue kTransformStyleKTable[];
static const KTableValue kBackgroundAttachmentKTable[];
static const KTableValue kBackgroundOriginKTable[];
static const KTableValue kBackgroundPositionKTable[];
static const KTableValue kBackgroundRepeatKTable[];
static const KTableValue kBackgroundRepeatPartKTable[];
static const KTableValue kBackgroundSizeKTable[];
static const KTableValue kBlendModeKTable[];
static const KTableValue kBorderCollapseKTable[];
static const KTableValue kBorderColorKTable[];
static const KTableValue kBorderImageRepeatKTable[];
static const KTableValue kBorderImageSliceKTable[];
static const KTableValue kBorderStyleKTable[];
static const KTableValue kBorderWidthKTable[];
static const KTableValue kBoxAlignKTable[];
static const KTableValue kBoxDecorationBreakKTable[];
static const KTableValue kBoxDirectionKTable[];
static const KTableValue kBoxOrientKTable[];
static const KTableValue kBoxPackKTable[];
static const KTableValue kClipShapeSizingKTable[];
static const KTableValue kCounterRangeKTable[];
static const KTableValue kCounterSpeakAsKTable[];
static const KTableValue kCounterSymbolsSystemKTable[];
static const KTableValue kCounterSystemKTable[];
static const KTableValue kDominantBaselineKTable[];
static const KTableValue kShapeRadiusKTable[];
static const KTableValue kFillRuleKTable[];
static const KTableValue kFilterFunctionKTable[];
static const KTableValue kImageRenderingKTable[];
static const KTableValue kShapeRenderingKTable[];
static const KTableValue kStrokeLinecapKTable[];
static const KTableValue kStrokeLinejoinKTable[];
static const KTableValue kStrokeContextValueKTable[];
static const KTableValue kVectorEffectKTable[];
static const KTableValue kTextAnchorKTable[];
static const KTableValue kTextRenderingKTable[];
static const KTableValue kColorInterpolationKTable[];
static const KTableValue kColumnFillKTable[];
static const KTableValue kBoxPropSourceKTable[];
static const KTableValue kBoxShadowTypeKTable[];
static const KTableValue kBoxSizingKTable[];
static const KTableValue kCaptionSideKTable[];
static const KTableEntry kAnimationDirectionKTable[];
static const KTableEntry kAnimationFillModeKTable[];
static const KTableEntry kAnimationIterationCountKTable[];
static const KTableEntry kAnimationPlayStateKTable[];
static const KTableEntry kAnimationTimingFunctionKTable[];
static const KTableEntry kAppearanceKTable[];
static const KTableEntry kAzimuthKTable[];
static const KTableEntry kBackfaceVisibilityKTable[];
static const KTableEntry kTransformStyleKTable[];
static const KTableEntry kBackgroundAttachmentKTable[];
static const KTableEntry kBackgroundOriginKTable[];
static const KTableEntry kBackgroundPositionKTable[];
static const KTableEntry kBackgroundRepeatKTable[];
static const KTableEntry kBackgroundRepeatPartKTable[];
static const KTableEntry kBackgroundSizeKTable[];
static const KTableEntry kBlendModeKTable[];
static const KTableEntry kBorderCollapseKTable[];
static const KTableEntry kBorderColorKTable[];
static const KTableEntry kBorderImageRepeatKTable[];
static const KTableEntry kBorderImageSliceKTable[];
static const KTableEntry kBorderStyleKTable[];
static const KTableEntry kBorderWidthKTable[];
static const KTableEntry kBoxAlignKTable[];
static const KTableEntry kBoxDecorationBreakKTable[];
static const KTableEntry kBoxDirectionKTable[];
static const KTableEntry kBoxOrientKTable[];
static const KTableEntry kBoxPackKTable[];
static const KTableEntry kClipShapeSizingKTable[];
static const KTableEntry kCounterRangeKTable[];
static const KTableEntry kCounterSpeakAsKTable[];
static const KTableEntry kCounterSymbolsSystemKTable[];
static const KTableEntry kCounterSystemKTable[];
static const KTableEntry kDominantBaselineKTable[];
static const KTableEntry kShapeRadiusKTable[];
static const KTableEntry kFillRuleKTable[];
static const KTableEntry kFilterFunctionKTable[];
static const KTableEntry kImageRenderingKTable[];
static const KTableEntry kShapeRenderingKTable[];
static const KTableEntry kStrokeLinecapKTable[];
static const KTableEntry kStrokeLinejoinKTable[];
static const KTableEntry kStrokeContextValueKTable[];
static const KTableEntry kVectorEffectKTable[];
static const KTableEntry kTextAnchorKTable[];
static const KTableEntry kTextRenderingKTable[];
static const KTableEntry kColorInterpolationKTable[];
static const KTableEntry kColumnFillKTable[];
static const KTableEntry kBoxPropSourceKTable[];
static const KTableEntry kBoxShadowTypeKTable[];
static const KTableEntry kBoxSizingKTable[];
static const KTableEntry kCaptionSideKTable[];
// Not const because we modify its entries when the pref
// "layout.css.float-logical-values.enabled" changes:
static KTableValue kClearKTable[];
static const KTableValue kColorKTable[];
static const KTableValue kContentKTable[];
static const KTableValue kControlCharacterVisibilityKTable[];
static const KTableValue kCursorKTable[];
static const KTableValue kDirectionKTable[];
static KTableEntry kClearKTable[];
static const KTableEntry kColorKTable[];
static const KTableEntry kContentKTable[];
static const KTableEntry kControlCharacterVisibilityKTable[];
static const KTableEntry kCursorKTable[];
static const KTableEntry kDirectionKTable[];
// Not const because we modify its entries when various
// "layout.css.*.enabled" prefs changes:
static KTableValue kDisplayKTable[];
static const KTableValue kElevationKTable[];
static const KTableValue kEmptyCellsKTable[];
static KTableEntry kDisplayKTable[];
static const KTableEntry kElevationKTable[];
static const KTableEntry kEmptyCellsKTable[];
// -- tables for the align-/justify-content/items/self properties --
static const KTableValue kAlignAllKeywords[];
static const KTableValue kAlignOverflowPosition[]; // <overflow-position>
static const KTableValue kAlignSelfPosition[]; // <self-position>
static const KTableValue kAlignLegacy[]; // 'legacy'
static const KTableValue kAlignLegacyPosition[]; // 'left/right/center'
static const KTableValue kAlignAutoStretchBaseline[]; // 'auto/stretch/baseline/last-baseline'
static const KTableValue kAlignAutoBaseline[]; // 'auto/baseline/last-baseline'
static const KTableValue kAlignContentDistribution[]; // <content-distribution>
static const KTableValue kAlignContentPosition[]; // <content-position>
static const KTableValue kAlignSelfKTable[];
static const KTableValue kJustifyContentKTable[];
static const KTableEntry kAlignAllKeywords[];
static const KTableEntry kAlignOverflowPosition[]; // <overflow-position>
static const KTableEntry kAlignSelfPosition[]; // <self-position>
static const KTableEntry kAlignLegacy[]; // 'legacy'
static const KTableEntry kAlignLegacyPosition[]; // 'left/right/center'
static const KTableEntry kAlignAutoStretchBaseline[]; // 'auto/stretch/baseline/last-baseline'
static const KTableEntry kAlignAutoBaseline[]; // 'auto/baseline/last-baseline'
static const KTableEntry kAlignContentDistribution[]; // <content-distribution>
static const KTableEntry kAlignContentPosition[]; // <content-position>
static const KTableEntry kAlignSelfKTable[];
static const KTableEntry kJustifyContentKTable[];
// ------------------------------------------------------------------
static const KTableValue kFlexDirectionKTable[];
static const KTableValue kFlexWrapKTable[];
static const KTableEntry kFlexDirectionKTable[];
static const KTableEntry kFlexWrapKTable[];
// Not const because we modify its entries when the pref
// "layout.css.float-logical-values.enabled" changes:
static KTableValue kFloatKTable[];
static const KTableValue kFloatEdgeKTable[];
static const KTableValue kFontKTable[];
static const KTableValue kFontKerningKTable[];
static const KTableValue kFontSizeKTable[];
static const KTableValue kFontSmoothingKTable[];
static const KTableValue kFontStretchKTable[];
static const KTableValue kFontStyleKTable[];
static const KTableValue kFontSynthesisKTable[];
static const KTableValue kFontVariantKTable[];
static const KTableValue kFontVariantAlternatesKTable[];
static const KTableValue kFontVariantAlternatesFuncsKTable[];
static const KTableValue kFontVariantCapsKTable[];
static const KTableValue kFontVariantEastAsianKTable[];
static const KTableValue kFontVariantLigaturesKTable[];
static const KTableValue kFontVariantNumericKTable[];
static const KTableValue kFontVariantPositionKTable[];
static const KTableValue kFontWeightKTable[];
static const KTableValue kGridAutoFlowKTable[];
static const KTableValue kGridTrackBreadthKTable[];
static const KTableValue kHyphensKTable[];
static const KTableValue kImageOrientationKTable[];
static const KTableValue kImageOrientationFlipKTable[];
static const KTableValue kIsolationKTable[];
static const KTableValue kIMEModeKTable[];
static const KTableValue kLineHeightKTable[];
static const KTableValue kListStylePositionKTable[];
static const KTableValue kListStyleKTable[];
static const KTableValue kMaskTypeKTable[];
static const KTableValue kMathVariantKTable[];
static const KTableValue kMathDisplayKTable[];
static const KTableValue kContainKTable[];
static const KTableValue kContextOpacityKTable[];
static const KTableValue kContextPatternKTable[];
static const KTableValue kObjectFitKTable[];
static const KTableValue kOrientKTable[];
static const KTableValue kOutlineStyleKTable[];
static const KTableValue kOutlineColorKTable[];
static const KTableValue kOverflowKTable[];
static const KTableValue kOverflowSubKTable[];
static const KTableValue kOverflowClipBoxKTable[];
static const KTableValue kPageBreakKTable[];
static const KTableValue kPageBreakInsideKTable[];
static const KTableValue kPageMarksKTable[];
static const KTableValue kPageSizeKTable[];
static const KTableValue kPitchKTable[];
static const KTableValue kPointerEventsKTable[];
static KTableEntry kFloatKTable[];
static const KTableEntry kFloatEdgeKTable[];
static const KTableEntry kFontKTable[];
static const KTableEntry kFontKerningKTable[];
static const KTableEntry kFontSizeKTable[];
static const KTableEntry kFontSmoothingKTable[];
static const KTableEntry kFontStretchKTable[];
static const KTableEntry kFontStyleKTable[];
static const KTableEntry kFontSynthesisKTable[];
static const KTableEntry kFontVariantKTable[];
static const KTableEntry kFontVariantAlternatesKTable[];
static const KTableEntry kFontVariantAlternatesFuncsKTable[];
static const KTableEntry kFontVariantCapsKTable[];
static const KTableEntry kFontVariantEastAsianKTable[];
static const KTableEntry kFontVariantLigaturesKTable[];
static const KTableEntry kFontVariantNumericKTable[];
static const KTableEntry kFontVariantPositionKTable[];
static const KTableEntry kFontWeightKTable[];
static const KTableEntry kGridAutoFlowKTable[];
static const KTableEntry kGridTrackBreadthKTable[];
static const KTableEntry kHyphensKTable[];
static const KTableEntry kImageOrientationKTable[];
static const KTableEntry kImageOrientationFlipKTable[];
static const KTableEntry kIsolationKTable[];
static const KTableEntry kIMEModeKTable[];
static const KTableEntry kLineHeightKTable[];
static const KTableEntry kListStylePositionKTable[];
static const KTableEntry kListStyleKTable[];
static const KTableEntry kMaskTypeKTable[];
static const KTableEntry kMathVariantKTable[];
static const KTableEntry kMathDisplayKTable[];
static const KTableEntry kContainKTable[];
static const KTableEntry kContextOpacityKTable[];
static const KTableEntry kContextPatternKTable[];
static const KTableEntry kObjectFitKTable[];
static const KTableEntry kOrientKTable[];
static const KTableEntry kOutlineStyleKTable[];
static const KTableEntry kOutlineColorKTable[];
static const KTableEntry kOverflowKTable[];
static const KTableEntry kOverflowSubKTable[];
static const KTableEntry kOverflowClipBoxKTable[];
static const KTableEntry kPageBreakKTable[];
static const KTableEntry kPageBreakInsideKTable[];
static const KTableEntry kPageMarksKTable[];
static const KTableEntry kPageSizeKTable[];
static const KTableEntry kPitchKTable[];
static const KTableEntry kPointerEventsKTable[];
// Not const because we modify its entries when the pref
// "layout.css.sticky.enabled" changes:
static KTableValue kPositionKTable[];
static const KTableValue kRadialGradientShapeKTable[];
static const KTableValue kRadialGradientSizeKTable[];
static const KTableValue kRadialGradientLegacySizeKTable[];
static const KTableValue kResizeKTable[];
static const KTableValue kRubyAlignKTable[];
static const KTableValue kRubyPositionKTable[];
static const KTableValue kScrollBehaviorKTable[];
static const KTableValue kScrollSnapTypeKTable[];
static const KTableValue kSpeakKTable[];
static const KTableValue kSpeakHeaderKTable[];
static const KTableValue kSpeakNumeralKTable[];
static const KTableValue kSpeakPunctuationKTable[];
static const KTableValue kSpeechRateKTable[];
static const KTableValue kStackSizingKTable[];
static const KTableValue kTableLayoutKTable[];
static KTableEntry kPositionKTable[];
static const KTableEntry kRadialGradientShapeKTable[];
static const KTableEntry kRadialGradientSizeKTable[];
static const KTableEntry kRadialGradientLegacySizeKTable[];
static const KTableEntry kResizeKTable[];
static const KTableEntry kRubyAlignKTable[];
static const KTableEntry kRubyPositionKTable[];
static const KTableEntry kScrollBehaviorKTable[];
static const KTableEntry kScrollSnapTypeKTable[];
static const KTableEntry kSpeakKTable[];
static const KTableEntry kSpeakHeaderKTable[];
static const KTableEntry kSpeakNumeralKTable[];
static const KTableEntry kSpeakPunctuationKTable[];
static const KTableEntry kSpeechRateKTable[];
static const KTableEntry kStackSizingKTable[];
static const KTableEntry kTableLayoutKTable[];
// Not const because we modify its entries when the pref
// "layout.css.text-align-true-value.enabled" changes:
static KTableValue kTextAlignKTable[];
static KTableValue kTextAlignLastKTable[];
static const KTableValue kTextCombineUprightKTable[];
static const KTableValue kTextDecorationLineKTable[];
static const KTableValue kTextDecorationStyleKTable[];
static const KTableValue kTextOrientationKTable[];
static const KTableValue kTextOverflowKTable[];
static const KTableValue kTextTransformKTable[];
static const KTableValue kTouchActionKTable[];
static const KTableValue kTopLayerKTable[];
static const KTableValue kTransformBoxKTable[];
static const KTableValue kTransitionTimingFunctionKTable[];
static const KTableValue kUnicodeBidiKTable[];
static const KTableValue kUserFocusKTable[];
static const KTableValue kUserInputKTable[];
static const KTableValue kUserModifyKTable[];
static const KTableValue kUserSelectKTable[];
static const KTableValue kVerticalAlignKTable[];
static const KTableValue kVisibilityKTable[];
static const KTableValue kVolumeKTable[];
static const KTableValue kWhitespaceKTable[];
static const KTableValue kWidthKTable[]; // also min-width, max-width
static const KTableValue kWindowDraggingKTable[];
static const KTableValue kWindowShadowKTable[];
static const KTableValue kWordBreakKTable[];
static const KTableValue kWordWrapKTable[];
static const KTableValue kWritingModeKTable[];
static KTableEntry kTextAlignKTable[];
static KTableEntry kTextAlignLastKTable[];
static const KTableEntry kTextCombineUprightKTable[];
static const KTableEntry kTextDecorationLineKTable[];
static const KTableEntry kTextDecorationStyleKTable[];
static const KTableEntry kTextOrientationKTable[];
static const KTableEntry kTextOverflowKTable[];
static const KTableEntry kTextTransformKTable[];
static const KTableEntry kTouchActionKTable[];
static const KTableEntry kTopLayerKTable[];
static const KTableEntry kTransformBoxKTable[];
static const KTableEntry kTransitionTimingFunctionKTable[];
static const KTableEntry kUnicodeBidiKTable[];
static const KTableEntry kUserFocusKTable[];
static const KTableEntry kUserInputKTable[];
static const KTableEntry kUserModifyKTable[];
static const KTableEntry kUserSelectKTable[];
static const KTableEntry kVerticalAlignKTable[];
static const KTableEntry kVisibilityKTable[];
static const KTableEntry kVolumeKTable[];
static const KTableEntry kWhitespaceKTable[];
static const KTableEntry kWidthKTable[]; // also min-width, max-width
static const KTableEntry kWindowDraggingKTable[];
static const KTableEntry kWindowShadowKTable[];
static const KTableEntry kWordBreakKTable[];
static const KTableEntry kWordWrapKTable[];
static const KTableEntry kWritingModeKTable[];
};
inline nsCSSProps::EnabledState operator|(nsCSSProps::EnabledState a,

6
layout/style/nsComputedDOMStyle.cpp
View File

@ -1791,7 +1791,7 @@ nsComputedDOMStyle::DoGetFontVariantPosition()
CSSValue*
nsComputedDOMStyle::GetBackgroundList(uint8_t nsStyleBackground::Layer::* aMember,
uint32_t nsStyleBackground::* aCount,
const KTableValue aTable[])
const KTableEntry aTable[])
{
const nsStyleBackground* bg = StyleBackground();
@ -3310,7 +3310,7 @@ nsComputedDOMStyle::DoGetVerticalAlign()
CSSValue*
nsComputedDOMStyle::CreateTextAlignValue(uint8_t aAlign, bool aAlignTrue,
const KTableValue aTable[])
const KTableEntry aTable[])
{
nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue;
val->SetIdent(nsCSSProps::ValueToKeywordEnum(aAlign, aTable));
@ -4866,7 +4866,7 @@ nsComputedDOMStyle::SetValueToCoord(nsROCSSPrimitiveValue* aValue,
const nsStyleCoord& aCoord,
bool aClampNegativeCalc,
PercentageBaseGetter aPercentageBaseGetter,
const KTableValue aTable[],
const KTableEntry aTable[],
nscoord aMinAppUnits,
nscoord aMaxAppUnits)
{

8
layout/style/nsComputedDOMStyle.h
View File

@ -48,7 +48,7 @@ class nsComputedDOMStyle final : public nsDOMCSSDeclaration
, public nsStubMutationObserver
{
public:
typedef nsCSSProps::KTableValue KTableValue;
typedef nsCSSProps::KTableEntry KTableEntry;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsComputedDOMStyle,
@ -127,7 +127,7 @@ private:
// Helper method for DoGetTextAlign[Last].
mozilla::dom::CSSValue* CreateTextAlignValue(uint8_t aAlign,
bool aAlignTrue,
const KTableValue aTable[]);
const KTableEntry aTable[]);
// This indicates error by leaving mStyleContext null.
void UpdateCurrentStyleSources(bool aNeedsLayoutFlush);
void ClearCurrentStyleSources();
@ -190,7 +190,7 @@ private:
mozilla::dom::CSSValue* GetBackgroundList(uint8_t nsStyleBackground::Layer::* aMember,
uint32_t nsStyleBackground::* aCount,
const KTableValue aTable[]);
const KTableEntry aTable[]);
void GetCSSGradientString(const nsStyleGradient* aGradient,
nsAString& aString);
@ -568,7 +568,7 @@ private:
const nsStyleCoord& aCoord,
bool aClampNegativeCalc,
PercentageBaseGetter aPercentageBaseGetter = nullptr,
const KTableValue aTable[] = nullptr,
const KTableEntry aTable[] = nullptr,
nscoord aMinAppUnits = nscoord_MIN,
nscoord aMaxAppUnits = nscoord_MAX);

4
layout/style/nsMediaFeatures.cpp
View File

@ -20,13 +20,13 @@
using namespace mozilla;
static const nsCSSProps::KTableValue kOrientationKeywords[] = {
static const nsCSSProps::KTableEntry kOrientationKeywords[] = {
{ eCSSKeyword_portrait, NS_STYLE_ORIENTATION_PORTRAIT },
{ eCSSKeyword_landscape, NS_STYLE_ORIENTATION_LANDSCAPE },
{ eCSSKeyword_UNKNOWN, -1 }
};
static const nsCSSProps::KTableValue kScanKeywords[] = {
static const nsCSSProps::KTableEntry kScanKeywords[] = {
{ eCSSKeyword_progressive, NS_STYLE_SCAN_PROGRESSIVE },
{ eCSSKeyword_interlace, NS_STYLE_SCAN_INTERLACE },
{ eCSSKeyword_UNKNOWN, -1 }

2
layout/style/nsMediaFeatures.h
View File

@ -62,7 +62,7 @@ struct nsMediaFeature {
const void* mInitializer_;
// If mValueType == eEnumerated: const int32_t*: keyword table in
// the same format as the keyword tables in nsCSSProps.
const nsCSSProps::KTableValue* mKeywordTable;
const nsCSSProps::KTableEntry* mKeywordTable;
// If mGetter == GetSystemMetric (which implies mValueType ==
// eBoolInteger): nsIAtom * const *, for the system metric.
nsIAtom * const * mMetric;