Bug 1294299 part 6 - Change ident of float property to float_. r=heycam

MozReview-Commit-ID: 9w57lJhNQKy

--HG--
extra : source : 14393c1e79f4ffefdd1a723639ea062322c3aa8c

layout/style/nsCSSPropList.h

@@ -1793,7 +1793,7 @@ CSS_PROP_POSITION(
     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,

layout/style/nsComputedDOMStylePropertyList.h

@@ -126,7 +126,7 @@ 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)