servo: Merge #14654 - Change property id of moz-prefixed properties to match their name (from upsuper:bug1311870); r=heycam
authorXidorn Quan <me@upsuper.org>
Tue, 20 Dec 2016 23:37:12 -0800
changeset 340384 444cb6b8e36fc51cc345323a2002e6c9b2517474
parent 340383 c74998394f8ef6926a6340570511d7acda285ef5
child 340385 8aa09a892bdcf79e896af1f1e5643ccc76a41b19
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs1311870
servo: Merge #14654 - Change property id of moz-prefixed properties to match their name (from upsuper:bug1311870); r=heycam <!-- Please describe your changes on the following line: --> This is the servo part of [bug 1311870](https://bugzilla.mozilla.org/show_bug.cgi?id=1311870) which has been reviewed by @heycam. r? @heycam --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: c2e4e4295e31c562885848c82fcb8ad76c844799
servo/components/style/gecko_bindings/structs_debug.rs
servo/components/style/gecko_bindings/structs_release.rs
servo/components/style/properties/gecko.mako.rs
servo/components/style/properties/longhand/column.mako.rs
servo/components/style/properties/properties.mako.rs
servo/components/style/properties/shorthand/column.mako.rs
--- 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,
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -2459,17 +2459,17 @@ clip-path
         self.gecko.mCursor = other.gecko.mCursor;
         unsafe {
             Gecko_CopyCursorArrayFrom(&mut self.gecko, &other.gecko);
         }
     }
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="Column"
-                  skip_longhands="column-count column-gap -moz-column-rule-width">
+                  skip_longhands="column-count column-gap column-rule-width">
 
     #[allow(unused_unsafe)]
     pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) {
         use gecko_bindings::structs::{NS_STYLE_COLUMN_COUNT_AUTO, nsStyleColumn_kMaxColumnCount};
 
         self.gecko.mColumnCount = match v.0 {
             Some(number) => unsafe {
                 cmp::min(number, nsStyleColumn_kMaxColumnCount)
@@ -2486,17 +2486,17 @@ clip-path
         match v {
             Either::First(len) => self.gecko.mColumnGap.set(len),
             Either::Second(_normal) => self.gecko.mColumnGap.set_value(CoordDataValue::Normal),
         }
     }
 
     <%call expr="impl_coord_copy('column_gap', 'mColumnGap')"></%call>
 
-    <% impl_app_units("_moz_column_rule_width", "mColumnRuleWidth", need_clone=True,
+    <% impl_app_units("column_rule_width", "mColumnRuleWidth", need_clone=True,
                       round_to_pixels=True) %>
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="Counters"
                   skip_longhands="content">
     pub fn set_content(&mut self, v: longhands::content::computed_value::T) {
         use properties::longhands::content::computed_value::T;
         use properties::longhands::content::computed_value::ContentItem;
--- a/servo/components/style/properties/longhand/column.mako.rs
+++ b/servo/components/style/properties/longhand/column.mako.rs
@@ -102,17 +102,17 @@
                           parse_method='parse_non_negative_length',
                           experimental=True,
                           animatable=False)}
 
 ${helpers.single_keyword("column-fill", "auto balance",
                          products="gecko", animatable=False)}
 
 // https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width
-<%helpers:longhand name="-moz-column-rule-width" products="gecko" animatable="True">
+<%helpers:longhand name="column-rule-width" products="gecko" animatable="True">
     use app_units::Au;
     use std::fmt;
     use style_traits::ToCss;
     use values::HasViewportPercentage;
     use values::specified::BorderWidth;
 
     pub mod computed_value {
         use app_units::Au;
@@ -132,24 +132,23 @@
     }
 
     pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
         BorderWidth::parse(context, input)
     }
 </%helpers:longhand>
 
 // https://drafts.csswg.org/css-multicol-1/#crc
-${helpers.predefined_type("-moz-column-rule-color", "CSSColor",
+${helpers.predefined_type("column-rule-color", "CSSColor",
                           "::cssparser::Color::CurrentColor",
-                          products="gecko", gecko_ffi_name="mColumnRuleColor",
-                          animatable=True, complex_color=True, need_clone=True)}
+                          products="gecko", animatable=True,
+                          complex_color=True, need_clone=True)}
 
 // It's not implemented in servo or gecko yet.
 // https://drafts.csswg.org/css-multicol-1/#column-span
 ${helpers.single_keyword("column-span", "none all",
                          products="none", animatable=False)}
 
-${helpers.single_keyword("-moz-column-rule-style",
+${helpers.single_keyword("column-rule-style",
                          "none hidden dotted dashed solid double groove ridge inset outset",
                          products="gecko",
-                         gecko_ffi_name="mColumnRuleStyle",
                          gecko_constant_prefix="NS_STYLE_BORDER_STYLE",
                          animatable=False)}
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -645,20 +645,16 @@ impl PropertyId {
         use gecko_bindings::structs::*;
         <%
             def to_nscsspropertyid(ident):
                 if ident == "word_wrap":
                     return "nsCSSPropertyID_eCSSPropertyAlias_WordWrap"
 
                 if ident == "float":
                     ident = "float_"
-                elif "outline_radius" in ident:
-                    ident = ident.replace("right", "Right").replace("left", "Left")
-                elif ident.startswith("_moz_"):
-                    ident = ident[len("_moz_"):]
                 return "nsCSSPropertyID::eCSSProperty_" + ident
         %>
         match id {
             % for property in data.longhands:
                 ${to_nscsspropertyid(property.ident)} => {
                     Ok(PropertyId::Longhand(LonghandId::${property.camel_case}))
                 }
             % endfor
--- a/servo/components/style/properties/shorthand/column.mako.rs
+++ b/servo/components/style/properties/shorthand/column.mako.rs
@@ -54,73 +54,73 @@
             try!(write!(dest, " "));
 
             self.column_count.to_css(dest)
         }
     }
 </%helpers:shorthand>
 
 // https://drafts.csswg.org/css-multicol/#column-rule
-<%helpers:shorthand name="-moz-column-rule" products="gecko"
-    sub_properties="-moz-column-rule-width -moz-column-rule-style -moz-column-rule-color">
-    use properties::longhands::{_moz_column_rule_width, _moz_column_rule_style};
-    use properties::longhands::_moz_column_rule_color;
+<%helpers:shorthand name="column-rule" products="gecko"
+    sub_properties="column-rule-width column-rule-style column-rule-color">
+    use properties::longhands::{column_rule_width, column_rule_style};
+    use properties::longhands::column_rule_color;
 
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
         % for name in "width style color".split():
         let mut column_rule_${name} = None;
         % endfor
         let mut any = false;
 
         loop {
             % for name in "width style color".split():
             if column_rule_${name}.is_none() {
                 if let Ok(value) = input.try(|input|
-                        _moz_column_rule_${name}::parse(context, input)) {
+                        column_rule_${name}::parse(context, input)) {
                     column_rule_${name} = Some(value);
                     any = true;
                     continue
                 }
             }
             % endfor
 
             break
         }
         if any {
             Ok(Longhands {
                 % for name in "width style".split():
-                    _moz_column_rule_${name}: column_rule_${name}
-                        .or(Some(_moz_column_rule_${name}::get_initial_specified_value())),
+                    column_rule_${name}: column_rule_${name}
+                        .or(Some(column_rule_${name}::get_initial_specified_value())),
                 % endfor
-                _moz_column_rule_color: column_rule_color,
+                column_rule_color: column_rule_color,
             })
         } else {
             Err(())
         }
     }
 
     impl<'a> LonghandsToSerialize<'a>  {
         fn to_css_declared<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
             let mut need_space = false;
-            try!(self._moz_column_rule_width.to_css(dest));
+            try!(self.column_rule_width.to_css(dest));
 
-            if let DeclaredValue::Value(ref width) = *self._moz_column_rule_width {
+            if let DeclaredValue::Value(ref width) = *self.column_rule_width {
                 try!(width.to_css(dest));
                 need_space = true;
             }
 
-            if let DeclaredValue::Value(ref style) = *self._moz_column_rule_style {
+            if let DeclaredValue::Value(ref style) = *self.column_rule_style {
                 if need_space {
                     try!(write!(dest, " "));
                 }
                 try!(style.to_css(dest));
                 need_space = true;
             }
 
-            if let DeclaredValue::Value(ref color) = *self._moz_column_rule_color {
+            if let DeclaredValue::Value(ref color) = *self.column_rule_color {
                 if need_space {
                     try!(write!(dest, " "));
                 }
                 try!(color.to_css(dest));
             }
             Ok(())
         }
     }