author | Xidorn Quan <me@upsuper.org> |
Tue, 17 Apr 2018 11:07:57 +1000 | |
changeset 413974 | a8aeb060a6c8fb048a334ea9bc6b2de0fe8d3bf2 |
parent 413973 | 69383ad18409381ba12aa29c84d550eaa07b75d0 |
child 413975 | 3793175d2c0075364ad2b45d27f2ec28a621654b |
push id | 33853 |
push user | cbrindusan@mozilla.com |
push date | Tue, 17 Apr 2018 09:51:13 +0000 |
treeherder | mozilla-central@8b0ba3f7d099 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | heycam |
bugs | 1454528 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -1286,21 +1286,21 @@ nsGenericHTMLElement::sBackgroundColorAt void nsGenericHTMLElement::MapImageAlignAttributeInto(const nsMappedAttributes* aAttributes, GenericSpecifiedValues* aData) { const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::align); if (value && value->Type() == nsAttrValue::eEnum) { int32_t align = value->GetEnumValue(); - if (!aData->PropertyIsSet(eCSSProperty_float_)) { + if (!aData->PropertyIsSet(eCSSProperty_float)) { if (align == NS_STYLE_TEXT_ALIGN_LEFT) { - aData->SetKeywordValue(eCSSProperty_float_, StyleFloat::Left); + aData->SetKeywordValue(eCSSProperty_float, StyleFloat::Left); } else if (align == NS_STYLE_TEXT_ALIGN_RIGHT) { - aData->SetKeywordValue(eCSSProperty_float_, StyleFloat::Right); + aData->SetKeywordValue(eCSSProperty_float, StyleFloat::Right); } } if (!aData->PropertyIsSet(eCSSProperty_vertical_align)) { switch (align) { case NS_STYLE_TEXT_ALIGN_LEFT: case NS_STYLE_TEXT_ALIGN_RIGHT: break; default:
--- a/layout/style/nsCSSPropList.h +++ b/layout/style/nsCSSPropList.h @@ -1267,17 +1267,17 @@ CSS_PROP_( FlexWrap, 0, "", VARIANT_HK, kFlexWrapKTable, eStyleAnimType_Discrete) CSS_PROP_( float, - float_, + float, CSS_PROP_PUBLIC_OR_PRIVATE(CssFloat, Float), 0, "", VARIANT_HK, kFloatKTable, eStyleAnimType_Discrete) CSS_PROP_( -moz-float-edge,
--- a/layout/style/nsComputedDOMStylePropertyList.h +++ b/layout/style/nsComputedDOMStylePropertyList.h @@ -124,17 +124,17 @@ COMPUTED_STYLE_PROP(cursor, COMPUTED_STYLE_PROP(direction, Direction) COMPUTED_STYLE_PROP(display, Display) COMPUTED_STYLE_PROP(empty_cells, EmptyCells) COMPUTED_STYLE_PROP(flex_basis, FlexBasis) COMPUTED_STYLE_PROP(flex_direction, FlexDirection) COMPUTED_STYLE_PROP(flex_grow, FlexGrow) COMPUTED_STYLE_PROP(flex_shrink, FlexShrink) COMPUTED_STYLE_PROP(flex_wrap, FlexWrap) -COMPUTED_STYLE_PROP(float_, Float) +COMPUTED_STYLE_PROP(float, Float) //// COMPUTED_STYLE_PROP(font, Font) COMPUTED_STYLE_PROP(font_family, FontFamily) COMPUTED_STYLE_PROP(font_feature_settings, FontFeatureSettings) COMPUTED_STYLE_PROP(font_kerning, FontKerning) COMPUTED_STYLE_PROP(font_language_override, FontLanguageOverride) COMPUTED_STYLE_PROP(font_optical_sizing, FontOpticalSizing) COMPUTED_STYLE_PROP(font_size, FontSize) COMPUTED_STYLE_PROP(font_size_adjust, FontSizeAdjust)
--- a/servo/components/style/properties/data.py +++ b/servo/components/style/properties/data.py @@ -306,20 +306,17 @@ class Longhand(object): def animated_type(self): assert self.animatable computed = "<{} as ToComputedValue>::ComputedValue".format(self.base_type()) if self.is_animatable_with_computed_value: return computed return "<{} as ToAnimatedValue>::AnimatedValue".format(computed) def nscsspropertyid(self): - ident = self.ident - if ident == "float": - ident = "float_" - return "nsCSSPropertyID::eCSSProperty_%s" % ident + return "nsCSSPropertyID::eCSSProperty_%s" % self.ident class Shorthand(object): def __init__(self, name, sub_properties, spec=None, servo_pref=None, gecko_pref=None, enabled_in="content", allowed_in_keyframe_block=True, alias=None, extra_prefixes=None, allowed_in_page_rule=False, flags=None): self.name = name