diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h index 0d29aaa234fe..8679aafaaec5 100644 --- a/layout/style/nsCSSPropList.h +++ b/layout/style/nsCSSPropList.h @@ -526,7 +526,6 @@ CSS_PROP_BACKGROUND( CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_HASHLESS_COLOR_QUIRK, "", VARIANT_HC, @@ -541,7 +540,6 @@ CSS_PROP_BACKGROUND( CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | CSS_PROPERTY_VALUE_LIST_USES_COMMAS | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_START_IMAGE_LOADS, "", VARIANT_IMAGE, // used by list parsing @@ -768,7 +766,6 @@ CSS_PROP_BORDER( BorderBottomColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_HASHLESS_COLOR_QUIRK, "", VARIANT_HC, @@ -1009,8 +1006,7 @@ CSS_PROP_BORDER( BorderLeftColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_HASHLESS_COLOR_QUIRK | - CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_APPLIES_TO_FIRST_LETTER, "", VARIANT_HC, nullptr, @@ -1058,8 +1054,7 @@ CSS_PROP_BORDER( BorderRightColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_HASHLESS_COLOR_QUIRK | - CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_APPLIES_TO_FIRST_LETTER, "", VARIANT_HC, nullptr, @@ -1118,7 +1113,6 @@ CSS_PROP_BORDER( BorderTopColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_HASHLESS_COLOR_QUIRK, "", VARIANT_HC, @@ -1269,8 +1263,7 @@ CSS_PROP_EFFECTS( BoxShadow, CSS_PROPERTY_PARSE_FUNCTION | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | - CSS_PROPERTY_VALUE_LIST_USES_COMMAS | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_VALUE_LIST_USES_COMMAS, // NOTE: some components must be nonnegative "", VARIANT_COLOR | VARIANT_LENGTH | VARIANT_CALC | VARIANT_INHERIT | VARIANT_NONE, @@ -1301,8 +1294,7 @@ CSS_PROP_USERINTERFACE( caret-color, caret_color, CaretColor, - CSS_PROPERTY_PARSE_VALUE | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_PARSE_VALUE, "", VARIANT_AUTO | VARIANT_HC, nullptr, @@ -1359,7 +1351,6 @@ CSS_PROP_COLOR( CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_HASHLESS_COLOR_QUIRK, "", VARIANT_HC, @@ -1436,8 +1427,7 @@ CSS_PROP_COLUMN( column-rule-color, column_rule_color, ColumnRuleColor, - CSS_PROPERTY_PARSE_VALUE | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_PARSE_VALUE, "", VARIANT_HC, nullptr, @@ -3028,8 +3018,7 @@ CSS_PROP_OUTLINE( outline-color, outline_color, OutlineColor, - CSS_PROPERTY_PARSE_VALUE | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_PARSE_VALUE, "", VARIANT_HC, nullptr, @@ -3905,8 +3894,7 @@ CSS_PROP_TEXTRESET( TextDecorationColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | - CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_APPLIES_TO_PLACEHOLDER, "", VARIANT_HC, nullptr, @@ -3947,8 +3935,7 @@ CSS_PROP_TEXT( text-emphasis-color, text_emphasis_color, TextEmphasisColor, - CSS_PROPERTY_PARSE_VALUE | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_PARSE_VALUE, "", VARIANT_HC, nullptr, @@ -3982,8 +3969,7 @@ CSS_PROP_TEXT( WebkitTextFillColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | - CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_APPLIES_TO_PLACEHOLDER, "layout.css.prefixes.webkit", VARIANT_HC, nullptr, @@ -4051,8 +4037,7 @@ CSS_PROP_TEXT( CSS_PROPERTY_PARSE_FUNCTION | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_VALUE_LIST_USES_COMMAS | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_VALUE_LIST_USES_COMMAS, // NOTE: some components must be nonnegative "", VARIANT_COLOR | VARIANT_LENGTH | VARIANT_CALC | VARIANT_INHERIT | VARIANT_NONE, @@ -4081,8 +4066,7 @@ CSS_PROP_TEXT( WebkitTextStrokeColor, CSS_PROPERTY_PARSE_VALUE | CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE | - CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | - CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED, + CSS_PROPERTY_APPLIES_TO_PLACEHOLDER, "layout.css.prefixes.webkit", VARIANT_HC, nullptr, diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index c3446c1125f0..6207eb2330fb 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -3103,9 +3103,6 @@ nsCSSProps::kParserVariantTable[eCSSProperty_COUNT_no_shorthands] = { static_assert((flags_) & CSS_PROPERTY_LOGICAL, \ "properties defined with CSS_PROP_LOGICAL must also use " \ "the CSS_PROPERTY_LOGICAL flag"); \ - static_assert(!((flags_) & CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED), \ - "CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED has no effect " \ - "on logical properties"); \ static_assert(!(((flags_) & CSS_PROPERTY_LOGICAL_AXIS) && \ ((flags_) & CSS_PROPERTY_LOGICAL_END_EDGE)), \ "CSS_PROPERTY_LOGICAL_END_EDGE makes no sense when used " \ diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h index c40706030a03..0cb87358e7eb 100644 --- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -134,10 +134,6 @@ #define CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE \ (CSS_PROPERTY_APPLIES_TO_FIRST_LETTER | CSS_PROPERTY_APPLIES_TO_FIRST_LINE) -// Note that 'background-color' is ignored differently from the other -// properties that have this set, but that's just special-cased. -#define CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED (1<<4) - // A property that needs to have image loads started when a URL value // for the property is used for an element. This is supported only // for a few possible value formats: image directly in the value; list