--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -47,22 +47,16 @@
or if the boolean property whose name is 'pref' is set to true.
-. 'parsevariant', to be passed to ParseVariant in the parser.
-. 'kwtable', which is either nullptr or the name of the appropriate
keyword table member of class nsCSSProps, for use in
nsCSSProps::LookupPropertyValue.
- -. 'group_' [used only for CSS_PROP_LOGICAL] is the name of
- the logical property group that contains the physical properties
- that can be set by this logical property. The name must be one
- from nsCSSPropLogicalGroupList.h. For example, this would be
- 'BorderColor' for 'border-block-start-color'.
-
-. 'stylestruct_' [used only for CSS_PROP and CSS_PROP_LOGICAL, not
CSS_PROP_*] gives the name of the style struct. Can be used to make
nsStyle##stylestruct_ and eStyleStruct_##stylestruct_
-. 'stylestructoffset_' gives the result of offsetof(nsStyle*,
member). Ignored (and generally CSS_PROP_NO_OFFSET, or -1) for
properties whose animtype_ is eStyleAnimType_None.
@@ -164,22 +158,22 @@
// are included in CSS_PROP (as long as CSS_PROP_LIST_INCLUDE_LOGICAL is
// defined).
#if defined(CSS_PROP_LOGICAL) && defined(CSS_PROP_LIST_EXCLUDE_LOGICAL) || defined(CSS_PROP_LOGICAL) && defined(CSS_PROP_LIST_INCLUDE_LOGICAL) || defined(CSS_PROP_LIST_EXCLUDE_LOGICAL) && defined(CSS_PROP_LIST_INCLUDE_LOGICAL)
#error Do not define more than one of CSS_PROP_LOGICAL, CSS_PROP_LIST_EXCLUDE_LOGICAL and CSS_PROP_LIST_INCLUDE_LOGICAL when capturing properties using CSS_PROP.
#endif
#ifndef CSS_PROP_LOGICAL
#ifdef CSS_PROP_LIST_INCLUDE_LOGICAL
-#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, group_, struct_, stylestructoffset_, animtype_) CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, struct_, stylestructoffset_, animtype_)
+#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, struct_, stylestructoffset_, animtype_) CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, struct_, stylestructoffset_, animtype_)
#else
#ifndef CSS_PROP_LIST_EXCLUDE_LOGICAL
#error Must define exactly one of CSS_PROP_LOGICAL, CSS_PROP_LIST_EXCLUDE_LOGICAL and CSS_PROP_LIST_INCLUDE_LOGICAL when capturing properties using CSS_PROP.
#endif
-#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, group_, struct_, stylestructoffset_, animtype_) /* nothing */
+#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, struct_, stylestructoffset_, animtype_) /* nothing */
#endif
#define DEFINED_CSS_PROP_LOGICAL
#endif
#else /* !defined(CSS_PROP) */
// An includer who does not define CSS_PROP can define any or all of the
// per-struct macros that are equivalent to it, and the rest will be
@@ -282,17 +276,17 @@
#define DEFINED_CSS_PROP_VARIABLES
#endif
#ifndef CSS_PROP_EFFECTS
#define CSS_PROP_EFFECTS(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, stylestructoffset_, animtype_) /* nothing */
#define DEFINED_CSS_PROP_EFFECTS
#endif
#ifndef CSS_PROP_LOGICAL
-#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, group_, struct_, stylestructoffset_, animtype_) /* nothing */
+#define CSS_PROP_LOGICAL(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, struct_, stylestructoffset_, animtype_) /* nothing */
#define DEFINED_CSS_PROP_LOGICAL
#endif
#endif /* !defined(CSS_PROP) */
/*************************************************************************/
// For notes XXX bug 3935 below, the names being parsed do not correspond
@@ -650,17 +644,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- Size,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_SHORTHAND(
border,
border,
Border,
CSS_PROPERTY_PARSE_FUNCTION,
@@ -678,33 +671,31 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HC,
nullptr,
- BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-end-style,
border_block_end_style,
BorderBlockEndStyle,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HK,
kBorderStyleKTable,
- BorderStyle,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-end-width,
border_block_end_width,
BorderBlockEndWidth,
CSS_PROPERTY_PARSE_VALUE |
@@ -712,17 +703,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HKL | VARIANT_CALC,
kBorderWidthKTable,
- BorderWidth,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_SHORTHAND(
border-block-start,
border_block_start,
BorderBlockStart,
CSS_PROPERTY_PARSE_FUNCTION,
@@ -733,49 +723,46 @@ CSS_PROP_LOGICAL(
BorderBlockStartColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_HC,
nullptr,
- BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-start-style,
border_block_start_style,
BorderBlockStartStyle,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_HK,
kBorderStyleKTable,
- BorderStyle,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-block-start-width,
border_block_start_width,
BorderBlockStartWidth,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_HKL | VARIANT_CALC,
kBorderWidthKTable,
- BorderWidth,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_SHORTHAND(
border-bottom,
border_bottom,
BorderBottom,
CSS_PROPERTY_PARSE_FUNCTION,
@@ -935,49 +922,46 @@ CSS_PROP_LOGICAL(
BorderInlineEndColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HC,
nullptr,
- BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-end-style,
border_inline_end_style,
BorderInlineEndStyle,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HK,
kBorderStyleKTable,
- BorderStyle,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-end-width,
border_inline_end_width,
BorderInlineEndWidth,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HKL | VARIANT_CALC,
kBorderWidthKTable,
- BorderWidth,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_SHORTHAND(
border-inline-start,
border_inline_start,
BorderInlineStart,
CSS_PROPERTY_PARSE_FUNCTION,
@@ -987,47 +971,44 @@ CSS_PROP_LOGICAL(
border_inline_start_color,
BorderInlineStartColor,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_HC,
nullptr,
- BorderColor,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-start-style,
border_inline_start_style,
BorderInlineStartStyle,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_HK,
kBorderStyleKTable,
- BorderStyle,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
border-inline-start-width,
border_inline_start_width,
BorderInlineStartWidth,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_HKL | VARIANT_CALC,
kBorderWidthKTable,
- BorderWidth,
Border,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_SHORTHAND(
border-left,
border_left,
BorderLeft,
CSS_PROPERTY_PARSE_FUNCTION,
@@ -2336,17 +2317,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS,
"",
VARIANT_AHKLP | VARIANT_CALC,
kWidthKTable,
- Size,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_DISPLAY(
isolation,
isolation,
Isolation,
CSS_PROPERTY_PARSE_VALUE |
@@ -2509,17 +2489,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
Margin,
- Margin,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
margin-block-start,
margin_block_start,
MarginBlockStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -2527,17 +2506,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_APPLIES_TO_PAGE_RULE |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
Margin,
- Margin,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_MARGIN(
margin-bottom,
margin_bottom,
MarginBottom,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
@@ -2559,33 +2537,31 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_APPLIES_TO_PAGE_RULE |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
Margin,
- Margin,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
margin-inline-start,
margin_inline_start,
MarginInlineStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_APPLIES_TO_PAGE_RULE |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
Margin,
- Margin,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_MARGIN(
margin-left,
margin_left,
MarginLeft,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_UNITLESS_LENGTH_QUIRK |
@@ -2828,17 +2804,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_HLPO | VARIANT_CALC,
nullptr,
- MaxSize,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_POSITION(
max-height,
max_height,
MaxHeight,
CSS_PROPERTY_PARSE_VALUE |
@@ -2858,17 +2833,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS,
"",
VARIANT_HKLPO | VARIANT_CALC,
kWidthKTable,
- MaxSize,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_POSITION(
max-width,
max_width,
MaxWidth,
CSS_PROPERTY_PARSE_VALUE |
@@ -2889,17 +2863,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- MinSize,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT(
-moz-min-font-size-ratio,
_moz_min_font_size_ratio,
CSS_PROP_DOMPROP_PREFIXED(MinFontSizeRatio),
@@ -2933,17 +2906,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_AXIS,
"",
VARIANT_AHKLP | VARIANT_CALC,
kWidthKTable,
- MinSize,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_POSITION(
min-width,
min_width,
MinWidth,
CSS_PROPERTY_PARSE_VALUE |
@@ -2995,64 +2967,60 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- Offset,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
offset-block-start,
offset_block_start,
OffsetBlockStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- Offset,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
offset-inline-end,
offset_inline_end,
OffsetInlineEnd,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- Offset,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
offset-inline-start,
offset_inline_start,
OffsetInlineStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
- Offset,
Position,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_EFFECTS(
opacity,
opacity,
Opacity,
CSS_PROPERTY_PARSE_VALUE |
@@ -3280,17 +3248,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HLP | VARIANT_CALC,
nullptr,
Padding,
- Padding,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
padding-block-start,
padding_block_start,
PaddingBlockStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
@@ -3300,17 +3267,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_BLOCK_AXIS,
"",
VARIANT_HLP | VARIANT_CALC,
nullptr,
Padding,
- Padding,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_PADDING(
padding-bottom,
padding_bottom,
PaddingBottom,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
@@ -3337,17 +3303,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL |
CSS_PROPERTY_LOGICAL_END_EDGE,
"",
VARIANT_HLP | VARIANT_CALC,
nullptr,
Padding,
- Padding,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_LOGICAL(
padding-inline-start,
padding_inline_start,
PaddingInlineStart,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |
@@ -3356,17 +3321,16 @@ CSS_PROP_LOGICAL(
CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |
CSS_PROPERTY_STORES_CALC |
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH |
CSS_PROPERTY_LOGICAL,
"",
VARIANT_HLP | VARIANT_CALC,
nullptr,
Padding,
- Padding,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_PADDING(
padding-left,
padding_left,
PaddingLeft,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE |