Bug 1294299 part 6 - Change ident of float property to float_. r=heycam
MozReview-Commit-ID: 9w57lJhNQKy
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -1788,17 +1788,17 @@ CSS_PROP_POSITION(
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_HK,
kFlexWrapKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
CSS_PROP_DISPLAY(
float,
- float,
+ float_,
CSS_PROP_PUBLIC_OR_PRIVATE(CssFloat, Float),
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER,
"",
VARIANT_HK,
kFloatKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@@ -121,17 +121,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_size, FontSize)
COMPUTED_STYLE_PROP(font_size_adjust, FontSizeAdjust)
COMPUTED_STYLE_PROP(font_stretch, FontStretch)