--- a/dom/base/nsTreeSanitizer.cpp
+++ b/dom/base/nsTreeSanitizer.cpp
@@ -1062,18 +1062,18 @@ nsTreeSanitizer::MustPrune(int32_t aName
}
return false;
}
bool
nsTreeSanitizer::SanitizeStyleDeclaration(mozilla::css::Declaration* aDeclaration,
nsAutoString& aRuleText)
{
- bool didSanitize = aDeclaration->HasProperty(eCSSProperty_binding);
- aDeclaration->RemovePropertyByID(eCSSProperty_binding);
+ bool didSanitize = aDeclaration->HasProperty(eCSSProperty__moz_binding);
+ aDeclaration->RemovePropertyByID(eCSSProperty__moz_binding);
aDeclaration->ToString(aRuleText);
return didSanitize;
}
bool
nsTreeSanitizer::SanitizeStyleSheet(const nsAString& aOriginal,
nsAString& aSanitized,
nsIDocument* aDocument,
--- a/layout/inspector/inDOMUtils.cpp
+++ b/layout/inspector/inDOMUtils.cpp
@@ -790,27 +790,27 @@ PropertySupportsVariant(nsCSSPropertyID
case eCSSProperty_grid_auto_rows:
case eCSSProperty_grid_template_columns:
case eCSSProperty_grid_template_rows:
case eCSSProperty_object_position:
case eCSSProperty_scroll_snap_coordinate:
case eCSSProperty_scroll_snap_destination:
case eCSSProperty_transform_origin:
case eCSSProperty_perspective_origin:
- case eCSSProperty__moz_outline_radius_topLeft:
- case eCSSProperty__moz_outline_radius_topRight:
- case eCSSProperty__moz_outline_radius_bottomLeft:
- case eCSSProperty__moz_outline_radius_bottomRight:
+ case eCSSProperty__moz_outline_radius_topleft:
+ case eCSSProperty__moz_outline_radius_topright:
+ case eCSSProperty__moz_outline_radius_bottomleft:
+ case eCSSProperty__moz_outline_radius_bottomright:
supported = VARIANT_LP;
break;
- case eCSSProperty_border_bottom_colors:
- case eCSSProperty_border_left_colors:
- case eCSSProperty_border_right_colors:
- case eCSSProperty_border_top_colors:
+ case eCSSProperty__moz_border_bottom_colors:
+ case eCSSProperty__moz_border_left_colors:
+ case eCSSProperty__moz_border_right_colors:
+ case eCSSProperty__moz_border_top_colors:
supported = VARIANT_COLOR;
break;
case eCSSProperty_text_shadow:
case eCSSProperty_box_shadow:
supported = VARIANT_LENGTH | VARIANT_COLOR;
break;
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -737,23 +737,23 @@ Declaration::GetPropertyValueInternal(
// this shorthand sets but cannot specify, we have to return the
// empty string.
if (data->ValueFor(eCSSProperty_border_image_source)->GetUnit() !=
eCSSUnit_None ||
!data->HasDefaultBorderImageSlice() ||
!data->HasDefaultBorderImageWidth() ||
!data->HasDefaultBorderImageOutset() ||
!data->HasDefaultBorderImageRepeat() ||
- data->ValueFor(eCSSProperty_border_top_colors)->GetUnit() !=
+ data->ValueFor(eCSSProperty__moz_border_top_colors)->GetUnit() !=
eCSSUnit_None ||
- data->ValueFor(eCSSProperty_border_right_colors)->GetUnit() !=
+ data->ValueFor(eCSSProperty__moz_border_right_colors)->GetUnit() !=
eCSSUnit_None ||
- data->ValueFor(eCSSProperty_border_bottom_colors)->GetUnit() !=
+ data->ValueFor(eCSSProperty__moz_border_bottom_colors)->GetUnit() !=
eCSSUnit_None ||
- data->ValueFor(eCSSProperty_border_left_colors)->GetUnit() !=
+ data->ValueFor(eCSSProperty__moz_border_left_colors)->GetUnit() !=
eCSSUnit_None) {
break;
}
const nsCSSPropertyID* subproptables[3] = {
nsCSSProps::SubpropertyEntryFor(eCSSProperty_border_color),
nsCSSProps::SubpropertyEntryFor(eCSSProperty_border_style),
nsCSSProps::SubpropertyEntryFor(eCSSProperty_border_width)
--- a/layout/style/StyleAnimationValue.cpp
+++ b/layout/style/StyleAnimationValue.cpp
@@ -4305,17 +4305,17 @@ StyleAnimationValue::ExtractComputedValu
static_cast<const nsStyleFont*>(styleStruct)->mFont.weight;
if (weight % 100 != 0) {
return false;
}
aComputedValue.SetIntValue(weight, eUnit_Integer);
return true;
}
- case eCSSProperty_image_region: {
+ case eCSSProperty__moz_image_region: {
const nsStyleList *list =
static_cast<const nsStyleList*>(styleStruct);
const nsRect &srect = list->mImageRegion;
if (srect.IsEmpty()) {
aComputedValue.SetAutoValue();
break;
}
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -11548,20 +11548,20 @@ static const nsCSSPropertyID kBorderColo
};
static const nsCSSPropertyID kBorderRadiusIDs[] = {
eCSSProperty_border_top_left_radius,
eCSSProperty_border_top_right_radius,
eCSSProperty_border_bottom_right_radius,
eCSSProperty_border_bottom_left_radius
};
static const nsCSSPropertyID kOutlineRadiusIDs[] = {
- eCSSProperty__moz_outline_radius_topLeft,
- eCSSProperty__moz_outline_radius_topRight,
- eCSSProperty__moz_outline_radius_bottomRight,
- eCSSProperty__moz_outline_radius_bottomLeft
+ eCSSProperty__moz_outline_radius_topleft,
+ eCSSProperty__moz_outline_radius_topright,
+ eCSSProperty__moz_outline_radius_bottomright,
+ eCSSProperty__moz_outline_radius_bottomleft
};
void
CSSParserImpl::SaveInputState(CSSParserInputState& aState)
{
aState.mToken = mToken;
aState.mHavePushBack = mHavePushBack;
mScanner->SavePosition(aState.mPosition);
@@ -11830,20 +11830,20 @@ CSSParserImpl::ParsePropertyByFunction(n
case eCSSProperty_border_inline_start:
return ParseBorderSide(kBorderInlineStartIDs, false);
case eCSSProperty_border_left:
return ParseBorderSide(kBorderLeftIDs, false);
case eCSSProperty_border_right:
return ParseBorderSide(kBorderRightIDs, false);
case eCSSProperty_border_top:
return ParseBorderSide(kBorderTopIDs, false);
- case eCSSProperty_border_bottom_colors:
- case eCSSProperty_border_left_colors:
- case eCSSProperty_border_right_colors:
- case eCSSProperty_border_top_colors:
+ case eCSSProperty__moz_border_bottom_colors:
+ case eCSSProperty__moz_border_left_colors:
+ case eCSSProperty__moz_border_right_colors:
+ case eCSSProperty__moz_border_top_colors:
return ParseBorderColors(aPropID);
case eCSSProperty_border_image_slice:
return ParseBorderImageSlice(true, nullptr);
case eCSSProperty_border_image_width:
return ParseBorderImageWidth(true);
case eCSSProperty_border_image_outset:
return ParseBorderImageOutset(true);
case eCSSProperty_border_image_repeat:
@@ -11856,20 +11856,20 @@ CSSParserImpl::ParsePropertyByFunction(n
return ParseBoxCornerRadii(kBorderRadiusIDs);
case eCSSProperty__moz_outline_radius:
return ParseBoxCornerRadii(kOutlineRadiusIDs);
case eCSSProperty_border_top_left_radius:
case eCSSProperty_border_top_right_radius:
case eCSSProperty_border_bottom_right_radius:
case eCSSProperty_border_bottom_left_radius:
- case eCSSProperty__moz_outline_radius_topLeft:
- case eCSSProperty__moz_outline_radius_topRight:
- case eCSSProperty__moz_outline_radius_bottomRight:
- case eCSSProperty__moz_outline_radius_bottomLeft:
+ case eCSSProperty__moz_outline_radius_topleft:
+ case eCSSProperty__moz_outline_radius_topright:
+ case eCSSProperty__moz_outline_radius_bottomright:
+ case eCSSProperty__moz_outline_radius_bottomleft:
return ParseBoxCornerRadius(aPropID);
case eCSSProperty_box_shadow:
case eCSSProperty_text_shadow:
return ParseShadowList(aPropID);
case eCSSProperty_clip:
return ParseRect(eCSSProperty_clip);
@@ -11918,18 +11918,18 @@ CSSParserImpl::ParsePropertyByFunction(n
eCSSProperty_grid_column_end);
case eCSSProperty_grid_row:
return ParseGridColumnRow(eCSSProperty_grid_row_start,
eCSSProperty_grid_row_end);
case eCSSProperty_grid_area:
return ParseGridArea();
case eCSSProperty_grid_gap:
return ParseGridGap();
- case eCSSProperty_image_region:
- return ParseRect(eCSSProperty_image_region);
+ case eCSSProperty__moz_image_region:
+ return ParseRect(eCSSProperty__moz_image_region);
case eCSSProperty_align_content:
case eCSSProperty_justify_content:
return ParseAlignJustifyContent(aPropID);
case eCSSProperty_align_items:
return ParseAlignItems();
case eCSSProperty_align_self:
case eCSSProperty_justify_self:
return ParseAlignJustifySelf(aPropID);
@@ -13632,20 +13632,20 @@ CSSParserImpl::ParseBorderSide(const nsC
for (int32_t index = 0; index < 4; index++) {
NS_ASSERTION(numProps == 3, "This code needs updating");
AppendValue(kBorderWidthIDs[index], values[0]);
AppendValue(kBorderStyleIDs[index], values[1]);
AppendValue(kBorderColorIDs[index], values[2]);
}
static const nsCSSPropertyID kBorderColorsProps[] = {
- eCSSProperty_border_top_colors,
- eCSSProperty_border_right_colors,
- eCSSProperty_border_bottom_colors,
- eCSSProperty_border_left_colors
+ eCSSProperty__moz_border_top_colors,
+ eCSSProperty__moz_border_right_colors,
+ eCSSProperty__moz_border_bottom_colors,
+ eCSSProperty__moz_border_left_colors
};
// Set the other properties that the border shorthand sets to their
// initial values.
nsCSSValue extraValue;
switch (values[0].GetUnit()) {
case eCSSUnit_Inherit:
case eCSSUnit_Initial:
--- a/layout/style/nsCSSPropAliasList.h
+++ b/layout/style/nsCSSPropAliasList.h
@@ -260,17 +260,17 @@ CSS_PROP_ALIAS(-webkit-animation-timing-
WebkitAnimationTimingFunction,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-filter,
filter,
WebkitFilter,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-text-size-adjust,
- text_size_adjust,
+ _moz_text_size_adjust,
WebkitTextSizeAdjust,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-transform,
transform,
WebkitTransform,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-transform-origin,
@@ -364,37 +364,37 @@ CSS_PROP_ALIAS(-webkit-box-sizing,
WEBKIT_PREFIX_PREF)
// Alias -webkit-box properties to their -moz-box equivalents.
// (NOTE: Even though they're aliases, in practice these -webkit properties
// will behave a bit differently from their -moz versions, if they're
// accompanied by "display:-webkit-box", because we generate a different frame
// for those two display values.)
CSS_PROP_ALIAS(-webkit-box-flex,
- box_flex,
+ _moz_box_flex,
WebkitBoxFlex,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-box-ordinal-group,
- box_ordinal_group,
+ _moz_box_ordinal_group,
WebkitBoxOrdinalGroup,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-box-orient,
- box_orient,
+ _moz_box_orient,
WebkitBoxOrient,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-box-direction,
- box_direction,
+ _moz_box_direction,
WebkitBoxDirection,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-box-align,
- box_align,
+ _moz_box_align,
WebkitBoxAlign,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-box-pack,
- box_pack,
+ _moz_box_pack,
WebkitBoxPack,
WEBKIT_PREFIX_PREF)
// Alias -webkit-flex related properties to their unprefixed equivalents:
// (Matching ordering at https://drafts.csswg.org/css-flexbox-1/#property-index )
CSS_PROP_ALIAS(-webkit-flex-direction,
flex_direction,
WebkitFlexDirection,
@@ -440,17 +440,17 @@ CSS_PROP_ALIAS(-webkit-align-self,
WebkitAlignSelf,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-align-content,
align_content,
WebkitAlignContent,
WEBKIT_PREFIX_PREF)
CSS_PROP_ALIAS(-webkit-user-select,
- user_select,
+ _moz_user_select,
WebkitUserSelect,
WEBKIT_PREFIX_PREF)
#ifdef MOZ_ENABLE_MASK_AS_SHORTHAND
CSS_PROP_ALIAS(-webkit-mask,
mask,
WebkitMask,
WEBKIT_PREFIX_PREF)
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -457,17 +457,17 @@ CSS_PROP_DISPLAY(
CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
"",
VARIANT_KEYWORD | VARIANT_TIMING_FUNCTION, // used by list parsing
kTransitionTimingFunctionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_DISPLAY(
-moz-appearance,
- appearance,
+ _moz_appearance,
CSS_PROP_DOMPROP_PREFIXED(Appearance),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kAppearanceKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_DISPLAY(
@@ -627,17 +627,17 @@ CSS_PROP_BACKGROUND(
CSS_PROPERTY_STORES_CALC,
"",
0,
kImageLayerSizeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
CSS_PROP_DISPLAY(
-moz-binding,
- binding,
+ _moz_binding,
CSS_PROP_DOMPROP_PREFIXED(Binding),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HUO,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None) // XXX bug 3935
CSS_PROP_LOGICAL(
@@ -789,17 +789,17 @@ CSS_PROP_BORDER(
CSS_PROPERTY_HASHLESS_COLOR_QUIRK,
"",
VARIANT_HC,
nullptr,
offsetof(nsStyleBorder, mBorderBottomColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-bottom-colors,
- border_bottom_colors,
+ _moz_border_bottom_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderBottomColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
@@ -1053,17 +1053,17 @@ CSS_PROP_BORDER(
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
VARIANT_HC,
nullptr,
offsetof(nsStyleBorder, mBorderLeftColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-left-colors,
- border_left_colors,
+ _moz_border_left_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderLeftColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
@@ -1115,17 +1115,17 @@ CSS_PROP_BORDER(
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
VARIANT_HC,
nullptr,
offsetof(nsStyleBorder, mBorderRightColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-right-colors,
- border_right_colors,
+ _moz_border_right_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderRightColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
@@ -1189,17 +1189,17 @@ CSS_PROP_BORDER(
CSS_PROPERTY_HASHLESS_COLOR_QUIRK,
"",
VARIANT_HC,
nullptr,
offsetof(nsStyleBorder, mBorderTopColor),
eStyleAnimType_ComplexColor)
CSS_PROP_BORDER(
-moz-border-top-colors,
- border_top_colors,
+ _moz_border_top_colors,
CSS_PROP_DOMPROP_PREFIXED(BorderTopColors),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
@@ -1272,17 +1272,17 @@ CSS_PROP_POSITION(
CSS_PROPERTY_GETCS_NEEDS_LAYOUT_FLUSH,
"",
VARIANT_AHLP | VARIANT_CALC,
nullptr,
offsetof(nsStylePosition, mOffset),
eStyleAnimType_Sides_Bottom)
CSS_PROP_XUL(
-moz-box-align,
- box_align,
+ _moz_box_align,
CSS_PROP_DOMPROP_PREFIXED(BoxAlign),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kBoxAlignKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_BORDER(
@@ -1292,59 +1292,59 @@ CSS_PROP_BORDER(
CSS_PROPERTY_PARSE_VALUE,
"layout.css.box-decoration-break.enabled",
VARIANT_HK,
kBoxDecorationBreakKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_XUL(
-moz-box-direction,
- box_direction,
+ _moz_box_direction,
CSS_PROP_DOMPROP_PREFIXED(BoxDirection),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kBoxDirectionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_XUL(
-moz-box-flex,
- box_flex,
+ _moz_box_flex,
CSS_PROP_DOMPROP_PREFIXED(BoxFlex),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE,
"",
VARIANT_HN,
nullptr,
offsetof(nsStyleXUL, mBoxFlex),
eStyleAnimType_float) // XXX bug 3935
CSS_PROP_XUL(
-moz-box-ordinal-group,
- box_ordinal_group,
+ _moz_box_ordinal_group,
CSS_PROP_DOMPROP_PREFIXED(BoxOrdinalGroup),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE,
"",
VARIANT_HI,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_XUL(
-moz-box-orient,
- box_orient,
+ _moz_box_orient,
CSS_PROP_DOMPROP_PREFIXED(BoxOrient),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kBoxOrientKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_XUL(
-moz-box-pack,
- box_pack,
+ _moz_box_pack,
CSS_PROP_DOMPROP_PREFIXED(BoxPack),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kBoxPackKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_EFFECTS(
@@ -1799,17 +1799,17 @@ CSS_PROP_DISPLAY(
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
"",
VARIANT_HK,
kFloatKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_BORDER(
-moz-float-edge,
- float_edge,
+ _moz_float_edge,
CSS_PROP_DOMPROP_PREFIXED(FloatEdge),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kFloatEdgeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_SVGRESET(
@@ -2061,17 +2061,17 @@ CSS_PROP_FONT(
// NOTE: This property has range restrictions on interpolation!
"",
0,
kFontWeightKTable,
offsetof(nsStyleFont, mFont.weight),
eStyleAnimType_Custom)
CSS_PROP_UIRESET(
-moz-force-broken-image-icon,
- force_broken_image_icon,
+ _moz_force_broken_image_icon,
CSS_PROP_DOMPROP_PREFIXED(ForceBrokenImageIcon),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_VALUE_NONNEGATIVE,
"",
VARIANT_HI,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // bug 58646
@@ -2290,17 +2290,17 @@ CSS_PROP_VISIBILITY(
CSS_PROPERTY_VALUE_PARSER_FUNCTION,
"layout.css.image-orientation.enabled",
0,
kImageOrientationKTable,
offsetof(nsStyleVisibility, mImageOrientation),
eStyleAnimType_Discrete)
CSS_PROP_LIST(
-moz-image-region,
- image_region,
+ _moz_image_region,
CSS_PROP_DOMPROP_PREFIXED(ImageRegion),
CSS_PROPERTY_PARSE_FUNCTION,
"",
0,
nullptr,
offsetof(nsStyleList, mImageRegion),
eStyleAnimType_Custom)
CSS_PROP_VISIBILITY(
@@ -2800,29 +2800,29 @@ CSS_PROP_SVGRESET(
VARIANT_HK,
kMaskTypeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT(
-moz-math-display,
- math_display,
+ _moz_math_display,
MathDisplay,
CSS_PROPERTY_INTERNAL |
CSS_PROPERTY_ENABLED_IN_UA_SHEETS |
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kMathDisplayKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
-moz-math-variant,
- math_variant,
+ _moz_math_variant,
MathVariant,
CSS_PROPERTY_INTERNAL |
CSS_PROPERTY_PARSE_INACCESSIBLE,
"",
VARIANT_HK,
kMathVariantKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
@@ -3082,27 +3082,27 @@ CSS_PROP_POSITION(
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HI,
nullptr,
offsetof(nsStylePosition, mOrder),
eStyleAnimType_Custom) // <integer>
CSS_PROP_DISPLAY(
-moz-orient,
- orient,
+ _moz_orient,
CSS_PROP_DOMPROP_PREFIXED(Orient),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kOrientKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_FONT(
-moz-osx-font-smoothing,
- osx_font_smoothing,
+ _moz_osx_font_smoothing,
CSS_PROP_DOMPROP_PREFIXED(OsxFontSmoothing),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
CSS_PROPERTY_APPLIES_TO_PLACEHOLDER,
"layout.css.osx-font-smoothing.enabled",
VARIANT_HK,
kFontSmoothingKTable,
CSS_PROP_NO_OFFSET,
@@ -3137,53 +3137,53 @@ CSS_PROP_OUTLINE(
CSS_PROP_SHORTHAND(
-moz-outline-radius,
_moz_outline_radius,
CSS_PROP_DOMPROP_PREFIXED(OutlineRadius),
CSS_PROPERTY_PARSE_FUNCTION,
"")
CSS_PROP_OUTLINE(
-moz-outline-radius-bottomleft,
- _moz_outline_radius_bottomLeft,
+ _moz_outline_radius_bottomleft,
CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusBottomleft),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC,
"",
0,
nullptr,
offsetof(nsStyleOutline, mOutlineRadius),
eStyleAnimType_Corner_BottomLeft)
CSS_PROP_OUTLINE(
-moz-outline-radius-bottomright,
- _moz_outline_radius_bottomRight,
+ _moz_outline_radius_bottomright,
CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusBottomright),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC,
"",
0,
nullptr,
offsetof(nsStyleOutline, mOutlineRadius),
eStyleAnimType_Corner_BottomRight)
CSS_PROP_OUTLINE(
-moz-outline-radius-topleft,
- _moz_outline_radius_topLeft,
+ _moz_outline_radius_topleft,
CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusTopleft),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC,
"",
0,
nullptr,
offsetof(nsStyleOutline, mOutlineRadius),
eStyleAnimType_Corner_TopLeft)
CSS_PROP_OUTLINE(
-moz-outline-radius-topright,
- _moz_outline_radius_topRight,
+ _moz_outline_radius_topright,
CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusTopright),
CSS_PROPERTY_PARSE_FUNCTION |
CSS_PROPERTY_VALUE_NONNEGATIVE |
CSS_PROPERTY_STORES_CALC,
"",
0,
nullptr,
offsetof(nsStyleOutline, mOutlineRadius),
@@ -3569,17 +3569,17 @@ CSS_PROP_TEXT(
VARIANT_HK,
kRubyPositionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT(
-moz-script-level,
- script_level,
+ _moz_script_level,
ScriptLevel,
// We only allow 'script-level' when unsafe rules are enabled, because
// otherwise it could interfere with rulenode optimizations if used in
// a non-MathML-enabled document.
CSS_PROPERTY_INTERNAL |
CSS_PROPERTY_ENABLED_IN_UA_SHEETS |
CSS_PROPERTY_PARSE_VALUE,
"",
@@ -3587,28 +3587,28 @@ CSS_PROP_FONT(
// ("increment if parent is not in displaystyle") and Integer
// ("relative") values can be specified in a style sheet.
VARIANT_AHI,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
-moz-script-min-size,
- script_min_size,
+ _moz_script_min_size,
ScriptMinSize,
CSS_PROPERTY_INTERNAL |
CSS_PROPERTY_PARSE_INACCESSIBLE,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
-moz-script-size-multiplier,
- script_size_multiplier,
+ _moz_script_size_multiplier,
ScriptSizeMultiplier,
CSS_PROPERTY_INTERNAL |
CSS_PROPERTY_PARSE_INACCESSIBLE,
"",
0,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
@@ -3733,17 +3733,17 @@ CSS_PROP_TABLE(
0,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
#endif // CSS_PROP_LIST_EXCLUDE_INTERNAL
#endif // CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
CSS_PROP_XUL(
-moz-stack-sizing,
- stack_sizing,
+ _moz_stack_sizing,
CSS_PROP_DOMPROP_PREFIXED(StackSizing),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kStackSizingKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_SVGRESET(
@@ -4085,17 +4085,17 @@ CSS_PROP_TEXT(
// NOTE: some components must be nonnegative
"",
0,
nullptr,
offsetof(nsStyleText, mTextShadow),
eStyleAnimType_Shadow)
CSS_PROP_TEXT(
-moz-text-size-adjust,
- text_size_adjust,
+ _moz_text_size_adjust,
CSS_PROP_DOMPROP_PREFIXED(TextSizeAdjust),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_AUTO | VARIANT_NONE | VARIANT_INHERIT,
nullptr,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_SHORTHAND(
@@ -4311,47 +4311,47 @@ CSS_PROP_TEXTRESET(
"",
VARIANT_HK,
kUnicodeBidiKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
#endif // CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
CSS_PROP_USERINTERFACE(
-moz-user-focus,
- user_focus,
+ _moz_user_focus,
CSS_PROP_DOMPROP_PREFIXED(UserFocus),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kUserFocusKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_USERINTERFACE(
-moz-user-input,
- user_input,
+ _moz_user_input,
CSS_PROP_DOMPROP_PREFIXED(UserInput),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kUserInputKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX ??? // XXX bug 3935
CSS_PROP_USERINTERFACE(
-moz-user-modify,
- user_modify,
+ _moz_user_modify,
CSS_PROP_DOMPROP_PREFIXED(UserModify),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kUserModifyKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_UIRESET(
-moz-user-select,
- user_select,
+ _moz_user_select,
CSS_PROP_DOMPROP_PREFIXED(UserSelect),
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kUserSelectKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete) // XXX bug 3935
CSS_PROP_SVGRESET(
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2614,20 +2614,20 @@ static const nsCSSPropertyID gBorderRadi
eCSSProperty_border_bottom_right_radius,
eCSSProperty_border_bottom_left_radius,
eCSSProperty_UNKNOWN
};
static const nsCSSPropertyID gOutlineRadiusSubpropTable[] = {
// Code relies on these being in topleft-topright-bottomright-bottomleft
// order.
- eCSSProperty__moz_outline_radius_topLeft,
- eCSSProperty__moz_outline_radius_topRight,
- eCSSProperty__moz_outline_radius_bottomRight,
- eCSSProperty__moz_outline_radius_bottomLeft,
+ eCSSProperty__moz_outline_radius_topleft,
+ eCSSProperty__moz_outline_radius_topright,
+ eCSSProperty__moz_outline_radius_bottomright,
+ eCSSProperty__moz_outline_radius_bottomleft,
eCSSProperty_UNKNOWN
};
static const nsCSSPropertyID gBackgroundSubpropTable[] = {
eCSSProperty_background_color,
eCSSProperty_background_image,
eCSSProperty_background_repeat,
eCSSProperty_background_attachment,
@@ -2653,20 +2653,20 @@ static const nsCSSPropertyID gBorderSubp
eCSSProperty_border_top_style,
eCSSProperty_border_right_style,
eCSSProperty_border_bottom_style,
eCSSProperty_border_left_style,
eCSSProperty_border_top_color,
eCSSProperty_border_right_color,
eCSSProperty_border_bottom_color,
eCSSProperty_border_left_color,
- eCSSProperty_border_top_colors,
- eCSSProperty_border_right_colors,
- eCSSProperty_border_bottom_colors,
- eCSSProperty_border_left_colors,
+ eCSSProperty__moz_border_top_colors,
+ eCSSProperty__moz_border_right_colors,
+ eCSSProperty__moz_border_bottom_colors,
+ eCSSProperty__moz_border_left_colors,
eCSSProperty_border_image_source,
eCSSProperty_border_image_slice,
eCSSProperty_border_image_width,
eCSSProperty_border_image_outset,
eCSSProperty_border_image_repeat,
eCSSProperty_UNKNOWN
};
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@@ -266,44 +266,44 @@ COMPUTED_STYLE_PROP(word_break,
COMPUTED_STYLE_PROP(word_spacing, WordSpacing)
COMPUTED_STYLE_PROP(writing_mode, WritingMode)
COMPUTED_STYLE_PROP(z_index, ZIndex)
/* ******************************* *\
* Implementations of -moz- styles *
\* ******************************* */
-COMPUTED_STYLE_PROP(appearance, Appearance)
-COMPUTED_STYLE_PROP(binding, Binding)
-COMPUTED_STYLE_PROP(border_bottom_colors, BorderBottomColors)
-COMPUTED_STYLE_PROP(border_left_colors, BorderLeftColors)
-COMPUTED_STYLE_PROP(border_right_colors, BorderRightColors)
-COMPUTED_STYLE_PROP(border_top_colors, BorderTopColors)
-COMPUTED_STYLE_PROP(box_align, BoxAlign)
-COMPUTED_STYLE_PROP(box_direction, BoxDirection)
-COMPUTED_STYLE_PROP(box_flex, BoxFlex)
-COMPUTED_STYLE_PROP(box_ordinal_group, BoxOrdinalGroup)
-COMPUTED_STYLE_PROP(box_orient, BoxOrient)
-COMPUTED_STYLE_PROP(box_pack, BoxPack)
-COMPUTED_STYLE_PROP(float_edge, FloatEdge)
-COMPUTED_STYLE_PROP(force_broken_image_icon, ForceBrokenImageIcon)
-COMPUTED_STYLE_PROP(image_region, ImageRegion)
-COMPUTED_STYLE_PROP(orient, Orient)
-COMPUTED_STYLE_PROP(osx_font_smoothing, OsxFontSmoothing)
-COMPUTED_STYLE_PROP(_moz_outline_radius_bottomLeft, OutlineRadiusBottomLeft)
-COMPUTED_STYLE_PROP(_moz_outline_radius_bottomRight,OutlineRadiusBottomRight)
-COMPUTED_STYLE_PROP(_moz_outline_radius_topLeft, OutlineRadiusTopLeft)
-COMPUTED_STYLE_PROP(_moz_outline_radius_topRight, OutlineRadiusTopRight)
-COMPUTED_STYLE_PROP(stack_sizing, StackSizing)
+COMPUTED_STYLE_PROP(_moz_appearance, Appearance)
+COMPUTED_STYLE_PROP(_moz_binding, Binding)
+COMPUTED_STYLE_PROP(_moz_border_bottom_colors, BorderBottomColors)
+COMPUTED_STYLE_PROP(_moz_border_left_colors, BorderLeftColors)
+COMPUTED_STYLE_PROP(_moz_border_right_colors, BorderRightColors)
+COMPUTED_STYLE_PROP(_moz_border_top_colors, BorderTopColors)
+COMPUTED_STYLE_PROP(_moz_box_align, BoxAlign)
+COMPUTED_STYLE_PROP(_moz_box_direction, BoxDirection)
+COMPUTED_STYLE_PROP(_moz_box_flex, BoxFlex)
+COMPUTED_STYLE_PROP(_moz_box_ordinal_group, BoxOrdinalGroup)
+COMPUTED_STYLE_PROP(_moz_box_orient, BoxOrient)
+COMPUTED_STYLE_PROP(_moz_box_pack, BoxPack)
+COMPUTED_STYLE_PROP(_moz_float_edge, FloatEdge)
+COMPUTED_STYLE_PROP(_moz_force_broken_image_icon, ForceBrokenImageIcon)
+COMPUTED_STYLE_PROP(_moz_image_region, ImageRegion)
+COMPUTED_STYLE_PROP(_moz_orient, Orient)
+COMPUTED_STYLE_PROP(_moz_osx_font_smoothing, OsxFontSmoothing)
+COMPUTED_STYLE_PROP(_moz_outline_radius_bottomleft, OutlineRadiusBottomLeft)
+COMPUTED_STYLE_PROP(_moz_outline_radius_bottomright,OutlineRadiusBottomRight)
+COMPUTED_STYLE_PROP(_moz_outline_radius_topleft, OutlineRadiusTopLeft)
+COMPUTED_STYLE_PROP(_moz_outline_radius_topright, OutlineRadiusTopRight)
+COMPUTED_STYLE_PROP(_moz_stack_sizing, StackSizing)
COMPUTED_STYLE_PROP(_moz_tab_size, TabSize)
-COMPUTED_STYLE_PROP(text_size_adjust, TextSizeAdjust)
-COMPUTED_STYLE_PROP(user_focus, UserFocus)
-COMPUTED_STYLE_PROP(user_input, UserInput)
-COMPUTED_STYLE_PROP(user_modify, UserModify)
-COMPUTED_STYLE_PROP(user_select, UserSelect)
+COMPUTED_STYLE_PROP(_moz_text_size_adjust, TextSizeAdjust)
+COMPUTED_STYLE_PROP(_moz_user_focus, UserFocus)
+COMPUTED_STYLE_PROP(_moz_user_input, UserInput)
+COMPUTED_STYLE_PROP(_moz_user_modify, UserModify)
+COMPUTED_STYLE_PROP(_moz_user_select, UserSelect)
COMPUTED_STYLE_PROP(_moz_window_dragging, WindowDragging)
COMPUTED_STYLE_PROP(_moz_window_shadow, WindowShadow)
/* ********************************** *\
* Implementations of -webkit- styles *
\* ********************************** */
COMPUTED_STYLE_PROP(_webkit_text_fill_color, WebkitTextFillColor)
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -7673,20 +7673,20 @@ nsRuleNode::ComputeBorderData(void* aSta
}
}
// -moz-border-*-colors: color, string, enum, none, inherit/initial
nscolor borderColor;
nscolor unused = NS_RGB(0,0,0);
static const nsCSSPropertyID borderColorsProps[] = {
- eCSSProperty_border_top_colors,
- eCSSProperty_border_right_colors,
- eCSSProperty_border_bottom_colors,
- eCSSProperty_border_left_colors
+ eCSSProperty__moz_border_top_colors,
+ eCSSProperty__moz_border_right_colors,
+ eCSSProperty__moz_border_bottom_colors,
+ eCSSProperty__moz_border_left_colors
};
NS_FOR_CSS_SIDES(side) {
const nsCSSValue& value = *aRuleData->ValueFor(borderColorsProps[side]);
switch (value.GetUnit()) {
case eCSSUnit_Null:
break;
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -98,25 +98,25 @@ nsInitialStyleRule::MapRuleInfoInto(nsRu
*value_end = value + nsCSSProps::PropertyCountInStruct(sid);
value != value_end; ++value) {
// If MathML is disabled take care not to set MathML properties (or we
// will trigger assertions in nsRuleNode)
if (sid == eStyleStruct_Font &&
!aRuleData->mPresContext->Document()->GetMathMLEnabled()) {
size_t index = value - value_start;
if (index == nsCSSProps::PropertyIndexInStruct(
- eCSSProperty_script_level) ||
+ eCSSProperty__moz_script_level) ||
index == nsCSSProps::PropertyIndexInStruct(
- eCSSProperty_script_size_multiplier) ||
+ eCSSProperty__moz_script_size_multiplier) ||
index == nsCSSProps::PropertyIndexInStruct(
- eCSSProperty_script_min_size) ||
+ eCSSProperty__moz_script_min_size) ||
index == nsCSSProps::PropertyIndexInStruct(
- eCSSProperty_math_variant) ||
+ eCSSProperty__moz_math_variant) ||
index == nsCSSProps::PropertyIndexInStruct(
- eCSSProperty_math_display)) {
+ eCSSProperty__moz_math_display)) {
continue;
}
}
if (value->GetUnit() == eCSSUnit_Null) {
value->SetInitialValue();
}
}
}
--- a/servo/components/style/gecko_bindings/structs_debug.rs
+++ b/servo/components/style/gecko_bindings/structs_debug.rs
@@ -10586,38 +10586,38 @@ pub mod root {
eCSSProperty_animation_delay = 3,
eCSSProperty_animation_direction = 4,
eCSSProperty_animation_duration = 5,
eCSSProperty_animation_fill_mode = 6,
eCSSProperty_animation_iteration_count = 7,
eCSSProperty_animation_name = 8,
eCSSProperty_animation_play_state = 9,
eCSSProperty_animation_timing_function = 10,
- eCSSProperty_appearance = 11,
+ eCSSProperty__moz_appearance = 11,
eCSSProperty_backface_visibility = 12,
eCSSProperty_background_attachment = 13,
eCSSProperty_background_blend_mode = 14,
eCSSProperty_background_clip = 15,
eCSSProperty_background_color = 16,
eCSSProperty_background_image = 17,
eCSSProperty_background_origin = 18,
eCSSProperty_background_position_x = 19,
eCSSProperty_background_position_y = 20,
eCSSProperty_background_repeat = 21,
eCSSProperty_background_size = 22,
- eCSSProperty_binding = 23,
+ eCSSProperty__moz_binding = 23,
eCSSProperty_block_size = 24,
eCSSProperty_border_block_end_color = 25,
eCSSProperty_border_block_end_style = 26,
eCSSProperty_border_block_end_width = 27,
eCSSProperty_border_block_start_color = 28,
eCSSProperty_border_block_start_style = 29,
eCSSProperty_border_block_start_width = 30,
eCSSProperty_border_bottom_color = 31,
- eCSSProperty_border_bottom_colors = 32,
+ eCSSProperty__moz_border_bottom_colors = 32,
eCSSProperty_border_bottom_left_radius = 33,
eCSSProperty_border_bottom_right_radius = 34,
eCSSProperty_border_bottom_style = 35,
eCSSProperty_border_bottom_width = 36,
eCSSProperty_border_collapse = 37,
eCSSProperty_border_image_outset = 38,
eCSSProperty_border_image_repeat = 39,
eCSSProperty_border_image_slice = 40,
@@ -10625,38 +10625,38 @@ pub mod root {
eCSSProperty_border_image_width = 42,
eCSSProperty_border_inline_end_color = 43,
eCSSProperty_border_inline_end_style = 44,
eCSSProperty_border_inline_end_width = 45,
eCSSProperty_border_inline_start_color = 46,
eCSSProperty_border_inline_start_style = 47,
eCSSProperty_border_inline_start_width = 48,
eCSSProperty_border_left_color = 49,
- eCSSProperty_border_left_colors = 50,
+ eCSSProperty__moz_border_left_colors = 50,
eCSSProperty_border_left_style = 51,
eCSSProperty_border_left_width = 52,
eCSSProperty_border_right_color = 53,
- eCSSProperty_border_right_colors = 54,
+ eCSSProperty__moz_border_right_colors = 54,
eCSSProperty_border_right_style = 55,
eCSSProperty_border_right_width = 56,
eCSSProperty_border_spacing = 57,
eCSSProperty_border_top_color = 58,
- eCSSProperty_border_top_colors = 59,
+ eCSSProperty__moz_border_top_colors = 59,
eCSSProperty_border_top_left_radius = 60,
eCSSProperty_border_top_right_radius = 61,
eCSSProperty_border_top_style = 62,
eCSSProperty_border_top_width = 63,
eCSSProperty_bottom = 64,
- eCSSProperty_box_align = 65,
+ eCSSProperty__moz_box_align = 65,
eCSSProperty_box_decoration_break = 66,
- eCSSProperty_box_direction = 67,
- eCSSProperty_box_flex = 68,
- eCSSProperty_box_ordinal_group = 69,
- eCSSProperty_box_orient = 70,
- eCSSProperty_box_pack = 71,
+ eCSSProperty__moz_box_direction = 67,
+ eCSSProperty__moz_box_flex = 68,
+ eCSSProperty__moz_box_ordinal_group = 69,
+ eCSSProperty__moz_box_orient = 70,
+ eCSSProperty__moz_box_pack = 71,
eCSSProperty_box_shadow = 72,
eCSSProperty_box_sizing = 73,
eCSSProperty_caption_side = 74,
eCSSProperty_clear = 75,
eCSSProperty_clip = 76,
eCSSProperty_clip_path = 77,
eCSSProperty_clip_rule = 78,
eCSSProperty_color = 79,
@@ -10685,17 +10685,17 @@ pub mod root {
eCSSProperty_fill_rule = 102,
eCSSProperty_filter = 103,
eCSSProperty_flex_basis = 104,
eCSSProperty_flex_direction = 105,
eCSSProperty_flex_grow = 106,
eCSSProperty_flex_shrink = 107,
eCSSProperty_flex_wrap = 108,
eCSSProperty_float_ = 109,
- eCSSProperty_float_edge = 110,
+ eCSSProperty__moz_float_edge = 110,
eCSSProperty_flood_color = 111,
eCSSProperty_flood_opacity = 112,
eCSSProperty_font_family = 113,
eCSSProperty_font_feature_settings = 114,
eCSSProperty_font_kerning = 115,
eCSSProperty_font_language_override = 116,
eCSSProperty_font_size = 117,
eCSSProperty_font_size_adjust = 118,
@@ -10705,34 +10705,34 @@ pub mod root {
eCSSProperty_font_variant_alternates = 122,
eCSSProperty_font_variant_caps = 123,
eCSSProperty_font_variant_east_asian = 124,
eCSSProperty_font_variant_ligatures = 125,
eCSSProperty_font_variant_numeric = 126,
eCSSProperty_font_variant_position = 127,
eCSSProperty_font_variation_settings = 128,
eCSSProperty_font_weight = 129,
- eCSSProperty_force_broken_image_icon = 130,
+ eCSSProperty__moz_force_broken_image_icon = 130,
eCSSProperty_grid_auto_columns = 131,
eCSSProperty_grid_auto_flow = 132,
eCSSProperty_grid_auto_rows = 133,
eCSSProperty_grid_column_end = 134,
eCSSProperty_grid_column_gap = 135,
eCSSProperty_grid_column_start = 136,
eCSSProperty_grid_row_end = 137,
eCSSProperty_grid_row_gap = 138,
eCSSProperty_grid_row_start = 139,
eCSSProperty_grid_template_areas = 140,
eCSSProperty_grid_template_columns = 141,
eCSSProperty_grid_template_rows = 142,
eCSSProperty_height = 143,
eCSSProperty_hyphens = 144,
eCSSProperty_initial_letter = 145,
eCSSProperty_image_orientation = 146,
- eCSSProperty_image_region = 147,
+ eCSSProperty__moz_image_region = 147,
eCSSProperty_image_rendering = 148,
eCSSProperty_ime_mode = 149,
eCSSProperty_inline_size = 150,
eCSSProperty_isolation = 151,
eCSSProperty_justify_content = 152,
eCSSProperty_justify_items = 153,
eCSSProperty_justify_self = 154,
eCSSProperty__x_lang = 155,
@@ -10779,24 +10779,24 @@ pub mod root {
eCSSProperty_object_fit = 196,
eCSSProperty_object_position = 197,
eCSSProperty_offset_block_end = 198,
eCSSProperty_offset_block_start = 199,
eCSSProperty_offset_inline_end = 200,
eCSSProperty_offset_inline_start = 201,
eCSSProperty_opacity = 202,
eCSSProperty_order = 203,
- eCSSProperty_orient = 204,
- eCSSProperty_osx_font_smoothing = 205,
+ eCSSProperty__moz_orient = 204,
+ eCSSProperty__moz_osx_font_smoothing = 205,
eCSSProperty_outline_color = 206,
eCSSProperty_outline_offset = 207,
- eCSSProperty__moz_outline_radius_bottomLeft = 208,
- eCSSProperty__moz_outline_radius_bottomRight = 209,
- eCSSProperty__moz_outline_radius_topLeft = 210,
- eCSSProperty__moz_outline_radius_topRight = 211,
+ eCSSProperty__moz_outline_radius_bottomleft = 208,
+ eCSSProperty__moz_outline_radius_bottomright = 209,
+ eCSSProperty__moz_outline_radius_topleft = 210,
+ eCSSProperty__moz_outline_radius_topright = 211,
eCSSProperty_outline_style = 212,
eCSSProperty_outline_width = 213,
eCSSProperty_overflow_clip_box = 214,
eCSSProperty_overflow_x = 215,
eCSSProperty_overflow_y = 216,
eCSSProperty_padding_block_end = 217,
eCSSProperty_padding_block_start = 218,
eCSSProperty_padding_bottom = 219,
@@ -10826,17 +10826,17 @@ pub mod root {
eCSSProperty_scroll_snap_destination = 243,
eCSSProperty_scroll_snap_points_x = 244,
eCSSProperty_scroll_snap_points_y = 245,
eCSSProperty_scroll_snap_type_x = 246,
eCSSProperty_scroll_snap_type_y = 247,
eCSSProperty_shape_outside = 248,
eCSSProperty_shape_rendering = 249,
eCSSProperty__x_span = 250,
- eCSSProperty_stack_sizing = 251,
+ eCSSProperty__moz_stack_sizing = 251,
eCSSProperty_stop_color = 252,
eCSSProperty_stop_opacity = 253,
eCSSProperty_stroke = 254,
eCSSProperty_stroke_dasharray = 255,
eCSSProperty_stroke_dashoffset = 256,
eCSSProperty_stroke_linecap = 257,
eCSSProperty_stroke_linejoin = 258,
eCSSProperty_stroke_miterlimit = 259,
@@ -10856,37 +10856,37 @@ pub mod root {
eCSSProperty_text_emphasis_position = 273,
eCSSProperty_text_emphasis_style = 274,
eCSSProperty__webkit_text_fill_color = 275,
eCSSProperty_text_indent = 276,
eCSSProperty_text_orientation = 277,
eCSSProperty_text_overflow = 278,
eCSSProperty_text_rendering = 279,
eCSSProperty_text_shadow = 280,
- eCSSProperty_text_size_adjust = 281,
+ eCSSProperty__moz_text_size_adjust = 281,
eCSSProperty__webkit_text_stroke_color = 282,
eCSSProperty__webkit_text_stroke_width = 283,
eCSSProperty_text_transform = 284,
eCSSProperty__x_text_zoom = 285,
eCSSProperty_top = 286,
eCSSProperty__moz_top_layer = 287,
eCSSProperty_touch_action = 288,
eCSSProperty_transform = 289,
eCSSProperty_transform_box = 290,
eCSSProperty_transform_origin = 291,
eCSSProperty_transform_style = 292,
eCSSProperty_transition_delay = 293,
eCSSProperty_transition_duration = 294,
eCSSProperty_transition_property = 295,
eCSSProperty_transition_timing_function = 296,
eCSSProperty_unicode_bidi = 297,
- eCSSProperty_user_focus = 298,
- eCSSProperty_user_input = 299,
- eCSSProperty_user_modify = 300,
- eCSSProperty_user_select = 301,
+ eCSSProperty__moz_user_focus = 298,
+ eCSSProperty__moz_user_input = 299,
+ eCSSProperty__moz_user_modify = 300,
+ eCSSProperty__moz_user_select = 301,
eCSSProperty_vector_effect = 302,
eCSSProperty_vertical_align = 303,
eCSSProperty_visibility = 304,
eCSSProperty_white_space = 305,
eCSSProperty_width = 306,
eCSSProperty_will_change = 307,
eCSSProperty__moz_window_dragging = 308,
eCSSProperty__moz_window_shadow = 309,
--- a/servo/components/style/gecko_bindings/structs_release.rs
+++ b/servo/components/style/gecko_bindings/structs_release.rs
@@ -10522,38 +10522,38 @@ pub mod root {
eCSSProperty_animation_delay = 3,
eCSSProperty_animation_direction = 4,
eCSSProperty_animation_duration = 5,
eCSSProperty_animation_fill_mode = 6,
eCSSProperty_animation_iteration_count = 7,
eCSSProperty_animation_name = 8,
eCSSProperty_animation_play_state = 9,
eCSSProperty_animation_timing_function = 10,
- eCSSProperty_appearance = 11,
+ eCSSProperty__moz_appearance = 11,
eCSSProperty_backface_visibility = 12,
eCSSProperty_background_attachment = 13,
eCSSProperty_background_blend_mode = 14,
eCSSProperty_background_clip = 15,
eCSSProperty_background_color = 16,
eCSSProperty_background_image = 17,
eCSSProperty_background_origin = 18,
eCSSProperty_background_position_x = 19,
eCSSProperty_background_position_y = 20,
eCSSProperty_background_repeat = 21,
eCSSProperty_background_size = 22,
- eCSSProperty_binding = 23,
+ eCSSProperty__moz_binding = 23,
eCSSProperty_block_size = 24,
eCSSProperty_border_block_end_color = 25,
eCSSProperty_border_block_end_style = 26,
eCSSProperty_border_block_end_width = 27,
eCSSProperty_border_block_start_color = 28,
eCSSProperty_border_block_start_style = 29,
eCSSProperty_border_block_start_width = 30,
eCSSProperty_border_bottom_color = 31,
- eCSSProperty_border_bottom_colors = 32,
+ eCSSProperty__moz_border_bottom_colors = 32,
eCSSProperty_border_bottom_left_radius = 33,
eCSSProperty_border_bottom_right_radius = 34,
eCSSProperty_border_bottom_style = 35,
eCSSProperty_border_bottom_width = 36,
eCSSProperty_border_collapse = 37,
eCSSProperty_border_image_outset = 38,
eCSSProperty_border_image_repeat = 39,
eCSSProperty_border_image_slice = 40,
@@ -10561,38 +10561,38 @@ pub mod root {
eCSSProperty_border_image_width = 42,
eCSSProperty_border_inline_end_color = 43,
eCSSProperty_border_inline_end_style = 44,
eCSSProperty_border_inline_end_width = 45,
eCSSProperty_border_inline_start_color = 46,
eCSSProperty_border_inline_start_style = 47,
eCSSProperty_border_inline_start_width = 48,
eCSSProperty_border_left_color = 49,
- eCSSProperty_border_left_colors = 50,
+ eCSSProperty__moz_border_left_colors = 50,
eCSSProperty_border_left_style = 51,
eCSSProperty_border_left_width = 52,
eCSSProperty_border_right_color = 53,
- eCSSProperty_border_right_colors = 54,
+ eCSSProperty__moz_border_right_colors = 54,
eCSSProperty_border_right_style = 55,
eCSSProperty_border_right_width = 56,
eCSSProperty_border_spacing = 57,
eCSSProperty_border_top_color = 58,
- eCSSProperty_border_top_colors = 59,
+ eCSSProperty__moz_border_top_colors = 59,
eCSSProperty_border_top_left_radius = 60,
eCSSProperty_border_top_right_radius = 61,
eCSSProperty_border_top_style = 62,
eCSSProperty_border_top_width = 63,
eCSSProperty_bottom = 64,
- eCSSProperty_box_align = 65,
+ eCSSProperty__moz_box_align = 65,
eCSSProperty_box_decoration_break = 66,
- eCSSProperty_box_direction = 67,
- eCSSProperty_box_flex = 68,
- eCSSProperty_box_ordinal_group = 69,
- eCSSProperty_box_orient = 70,
- eCSSProperty_box_pack = 71,
+ eCSSProperty__moz_box_direction = 67,
+ eCSSProperty__moz_box_flex = 68,
+ eCSSProperty__moz_box_ordinal_group = 69,
+ eCSSProperty__moz_box_orient = 70,
+ eCSSProperty__moz_box_pack = 71,
eCSSProperty_box_shadow = 72,
eCSSProperty_box_sizing = 73,
eCSSProperty_caption_side = 74,
eCSSProperty_clear = 75,
eCSSProperty_clip = 76,
eCSSProperty_clip_path = 77,
eCSSProperty_clip_rule = 78,
eCSSProperty_color = 79,
@@ -10621,17 +10621,17 @@ pub mod root {
eCSSProperty_fill_rule = 102,
eCSSProperty_filter = 103,
eCSSProperty_flex_basis = 104,
eCSSProperty_flex_direction = 105,
eCSSProperty_flex_grow = 106,
eCSSProperty_flex_shrink = 107,
eCSSProperty_flex_wrap = 108,
eCSSProperty_float_ = 109,
- eCSSProperty_float_edge = 110,
+ eCSSProperty__moz_float_edge = 110,
eCSSProperty_flood_color = 111,
eCSSProperty_flood_opacity = 112,
eCSSProperty_font_family = 113,
eCSSProperty_font_feature_settings = 114,
eCSSProperty_font_kerning = 115,
eCSSProperty_font_language_override = 116,
eCSSProperty_font_size = 117,
eCSSProperty_font_size_adjust = 118,
@@ -10641,34 +10641,34 @@ pub mod root {
eCSSProperty_font_variant_alternates = 122,
eCSSProperty_font_variant_caps = 123,
eCSSProperty_font_variant_east_asian = 124,
eCSSProperty_font_variant_ligatures = 125,
eCSSProperty_font_variant_numeric = 126,
eCSSProperty_font_variant_position = 127,
eCSSProperty_font_variation_settings = 128,
eCSSProperty_font_weight = 129,
- eCSSProperty_force_broken_image_icon = 130,
+ eCSSProperty__moz_force_broken_image_icon = 130,
eCSSProperty_grid_auto_columns = 131,
eCSSProperty_grid_auto_flow = 132,
eCSSProperty_grid_auto_rows = 133,
eCSSProperty_grid_column_end = 134,
eCSSProperty_grid_column_gap = 135,
eCSSProperty_grid_column_start = 136,
eCSSProperty_grid_row_end = 137,
eCSSProperty_grid_row_gap = 138,
eCSSProperty_grid_row_start = 139,
eCSSProperty_grid_template_areas = 140,
eCSSProperty_grid_template_columns = 141,
eCSSProperty_grid_template_rows = 142,
eCSSProperty_height = 143,
eCSSProperty_hyphens = 144,
eCSSProperty_initial_letter = 145,
eCSSProperty_image_orientation = 146,
- eCSSProperty_image_region = 147,
+ eCSSProperty__moz_image_region = 147,
eCSSProperty_image_rendering = 148,
eCSSProperty_ime_mode = 149,
eCSSProperty_inline_size = 150,
eCSSProperty_isolation = 151,
eCSSProperty_justify_content = 152,
eCSSProperty_justify_items = 153,
eCSSProperty_justify_self = 154,
eCSSProperty__x_lang = 155,
@@ -10715,24 +10715,24 @@ pub mod root {
eCSSProperty_object_fit = 196,
eCSSProperty_object_position = 197,
eCSSProperty_offset_block_end = 198,
eCSSProperty_offset_block_start = 199,
eCSSProperty_offset_inline_end = 200,
eCSSProperty_offset_inline_start = 201,
eCSSProperty_opacity = 202,
eCSSProperty_order = 203,
- eCSSProperty_orient = 204,
- eCSSProperty_osx_font_smoothing = 205,
+ eCSSProperty__moz_orient = 204,
+ eCSSProperty__moz_osx_font_smoothing = 205,
eCSSProperty_outline_color = 206,
eCSSProperty_outline_offset = 207,
- eCSSProperty__moz_outline_radius_bottomLeft = 208,
- eCSSProperty__moz_outline_radius_bottomRight = 209,
- eCSSProperty__moz_outline_radius_topLeft = 210,
- eCSSProperty__moz_outline_radius_topRight = 211,
+ eCSSProperty__moz_outline_radius_bottomleft = 208,
+ eCSSProperty__moz_outline_radius_bottomright = 209,
+ eCSSProperty__moz_outline_radius_topleft = 210,
+ eCSSProperty__moz_outline_radius_topright = 211,
eCSSProperty_outline_style = 212,
eCSSProperty_outline_width = 213,
eCSSProperty_overflow_clip_box = 214,
eCSSProperty_overflow_x = 215,
eCSSProperty_overflow_y = 216,
eCSSProperty_padding_block_end = 217,
eCSSProperty_padding_block_start = 218,
eCSSProperty_padding_bottom = 219,
@@ -10762,17 +10762,17 @@ pub mod root {
eCSSProperty_scroll_snap_destination = 243,
eCSSProperty_scroll_snap_points_x = 244,
eCSSProperty_scroll_snap_points_y = 245,
eCSSProperty_scroll_snap_type_x = 246,
eCSSProperty_scroll_snap_type_y = 247,
eCSSProperty_shape_outside = 248,
eCSSProperty_shape_rendering = 249,
eCSSProperty__x_span = 250,
- eCSSProperty_stack_sizing = 251,
+ eCSSProperty__moz_stack_sizing = 251,
eCSSProperty_stop_color = 252,
eCSSProperty_stop_opacity = 253,
eCSSProperty_stroke = 254,
eCSSProperty_stroke_dasharray = 255,
eCSSProperty_stroke_dashoffset = 256,
eCSSProperty_stroke_linecap = 257,
eCSSProperty_stroke_linejoin = 258,
eCSSProperty_stroke_miterlimit = 259,
@@ -10792,37 +10792,37 @@ pub mod root {
eCSSProperty_text_emphasis_position = 273,
eCSSProperty_text_emphasis_style = 274,
eCSSProperty__webkit_text_fill_color = 275,
eCSSProperty_text_indent = 276,
eCSSProperty_text_orientation = 277,
eCSSProperty_text_overflow = 278,
eCSSProperty_text_rendering = 279,
eCSSProperty_text_shadow = 280,
- eCSSProperty_text_size_adjust = 281,
+ eCSSProperty__moz_text_size_adjust = 281,
eCSSProperty__webkit_text_stroke_color = 282,
eCSSProperty__webkit_text_stroke_width = 283,
eCSSProperty_text_transform = 284,
eCSSProperty__x_text_zoom = 285,
eCSSProperty_top = 286,
eCSSProperty__moz_top_layer = 287,
eCSSProperty_touch_action = 288,
eCSSProperty_transform = 289,
eCSSProperty_transform_box = 290,
eCSSProperty_transform_origin = 291,
eCSSProperty_transform_style = 292,
eCSSProperty_transition_delay = 293,
eCSSProperty_transition_duration = 294,
eCSSProperty_transition_property = 295,
eCSSProperty_transition_timing_function = 296,
eCSSProperty_unicode_bidi = 297,
- eCSSProperty_user_focus = 298,
- eCSSProperty_user_input = 299,
- eCSSProperty_user_modify = 300,
- eCSSProperty_user_select = 301,
+ eCSSProperty__moz_user_focus = 298,
+ eCSSProperty__moz_user_input = 299,
+ eCSSProperty__moz_user_modify = 300,
+ eCSSProperty__moz_user_select = 301,
eCSSProperty_vector_effect = 302,
eCSSProperty_vertical_align = 303,
eCSSProperty_visibility = 304,
eCSSProperty_white_space = 305,
eCSSProperty_width = 306,
eCSSProperty_will_change = 307,
eCSSProperty__moz_window_dragging = 308,
eCSSProperty__moz_window_shadow = 309,