From 4c5f1a375e781917a31b3b8fbf3460309afaf163 Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Thu, 21 Apr 2016 14:32:14 -0700 Subject: [PATCH] Regenerate style struct bindings with latest bindgen and gecko. --- ports/geckolib/gecko_style_structs.rs | 763 +++++++++++--------- ports/geckolib/properties.mako.rs | 5 + ports/geckolib/tools/regen_style_structs.sh | 1 + 3 files changed, 426 insertions(+), 343 deletions(-) diff --git a/ports/geckolib/gecko_style_structs.rs b/ports/geckolib/gecko_style_structs.rs index 76bd7936f55..039f1b1320a 100644 --- a/ports/geckolib/gecko_style_structs.rs +++ b/ports/geckolib/gecko_style_structs.rs @@ -1,6 +1,6 @@ /* automatically generated by rust-bindgen */ -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Debug)] pub struct __BindgenUnionField(::std::marker::PhantomData); impl __BindgenUnionField { #[inline] @@ -14,6 +14,10 @@ impl ::std::default::Default for __BindgenUnionField { #[inline] fn default() -> Self { Self::new() } } +impl ::std::clone::Clone for __BindgenUnionField { + #[inline] + fn clone(&self) -> Self { Self::new() } +} pub const NS_ERROR_MODULE_XPCOM: ::std::os::raw::c_uint = 1; pub const NS_ERROR_MODULE_BASE: ::std::os::raw::c_uint = 2; pub const NS_ERROR_MODULE_GFX: ::std::os::raw::c_uint = 3; @@ -196,6 +200,7 @@ pub const NS_STYLE_IMAGELAYER_ATTACHMENT_LOCAL: ::std::os::raw::c_uint = 2; pub const NS_STYLE_IMAGELAYER_CLIP_BORDER: ::std::os::raw::c_uint = 0; pub const NS_STYLE_IMAGELAYER_CLIP_PADDING: ::std::os::raw::c_uint = 1; pub const NS_STYLE_IMAGELAYER_CLIP_CONTENT: ::std::os::raw::c_uint = 2; +pub const NS_STYLE_IMAGELAYER_CLIP_TEXT: ::std::os::raw::c_uint = 3; pub const NS_STYLE_IMAGELAYER_CLIP_MOZ_ALMOST_PADDING: ::std::os::raw::c_uint = 127; @@ -1374,6 +1379,7 @@ impl ::std::clone::Clone for nsDefaultStringComparator { fn clone(&self) -> Self { *self } } #[repr(C)] +#[derive(Debug)] pub struct nsAString_internal { pub mData: *mut ::std::os::raw::c_ushort, pub mLength: ::std::os::raw::c_uint, @@ -1411,6 +1417,7 @@ impl ::std::clone::Clone for nsDefaultCStringComparator { fn clone(&self) -> Self { *self } } #[repr(C)] +#[derive(Debug)] pub struct nsACString_internal { pub mData: *mut ::std::os::raw::c_char, pub mLength: ::std::os::raw::c_uint, @@ -1482,6 +1489,7 @@ fn bindgen_test_layout_nsCSubstringTuple() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsString { pub _base: nsAString_internal, } @@ -1505,6 +1513,7 @@ fn bindgen_test_layout_nsString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsFixedString { pub _base: nsString, pub mFixedCapacity: ::std::os::raw::c_uint, @@ -1531,11 +1540,11 @@ fn bindgen_test_layout_nsAutoString() { pub enum Dont_Instantiate_nsTArray_of { } pub enum Instead_Use_nsTArray_of { } #[repr(C)] -#[derive(Debug, Copy, Clone)] pub struct nsTArrayElementTraits<> { pub _phantom0: ::std::marker::PhantomData, } #[repr(C)] +#[derive(Debug)] pub struct nsXPIDLString { pub _base: nsString, } @@ -1545,6 +1554,7 @@ fn bindgen_test_layout_nsXPIDLString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsGetterCopies { pub mString: *mut nsAString_internal, pub mData: *mut ::std::os::raw::c_ushort, @@ -1555,6 +1565,7 @@ fn bindgen_test_layout_nsGetterCopies() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsAdoptingString { pub _base: nsXPIDLString, } @@ -1564,6 +1575,7 @@ fn bindgen_test_layout_nsAdoptingString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCString { pub _base: nsACString_internal, } @@ -1587,6 +1599,7 @@ fn bindgen_test_layout_nsCString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsFixedCString { pub _base: nsCString, pub mFixedCapacity: ::std::os::raw::c_uint, @@ -1611,6 +1624,7 @@ fn bindgen_test_layout_nsAutoCString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsXPIDLCString { pub _base: nsCString, } @@ -1620,6 +1634,7 @@ fn bindgen_test_layout_nsXPIDLCString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCGetterCopies { pub mString: *mut nsACString_internal, pub mData: *mut ::std::os::raw::c_char, @@ -1630,6 +1645,7 @@ fn bindgen_test_layout_nsCGetterCopies() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsAdoptingCString { pub _base: nsXPIDLCString, } @@ -1782,6 +1798,7 @@ pub enum nsCSSScannerExclude { eCSSScannerExclude_WhitespaceAndComments = 2, } #[repr(C)] +#[derive(Debug)] pub struct nsCSSScanner { pub mBuffer: *const ::std::os::raw::c_ushort, pub mOffset: u32, @@ -1848,16 +1865,13 @@ fn bindgen_test_layout_nsCSSGridTemplateAreaScanner() { * A "unique identifier". This is modeled after OSF DCE UUIDs. */ #[repr(C)] -#[derive(Debug, Copy)] +#[derive(Debug)] pub struct nsID { pub m0: u32, pub m1: u16, pub m2: u16, pub m3: [u8; 8usize], } -impl ::std::clone::Clone for nsID { - fn clone(&self) -> Self { *self } -} #[test] fn bindgen_test_layout_nsID() { assert_eq!(::std::mem::size_of::() , 16usize); @@ -1953,6 +1967,7 @@ fn bindgen_test_layout_nsAutoRefCnt() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct ThreadSafeAutoRefCnt { pub mValue: u64, } @@ -1995,10 +2010,12 @@ pub struct RefPtrTraits { pub _phantom0: ::std::marker::PhantomData, } #[repr(C)] +#[derive(Debug)] pub struct RefPtr { pub mRawPtr: *mut T, } #[repr(C)] +#[derive(Debug)] pub struct RefPtr_Proxy { pub mRawPtr: *mut T, pub _phantom0: ::std::marker::PhantomData, @@ -2116,6 +2133,7 @@ fn bindgen_test_layout_nsGetServiceByContractIDWithError() { * template class Foo : private Foo { ... }; */ #[repr(C)] +#[derive(Debug)] pub struct nsCOMPtr_base { pub mRawPtr: *mut nsISupports, } @@ -2125,6 +2143,7 @@ fn bindgen_test_layout_nsCOMPtr_base() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCOMPtr { pub mRawPtr: *mut T, } @@ -2144,11 +2163,13 @@ pub struct nsCOMPtr { * This type should be a nested class inside |nsCOMPtr|. */ #[repr(C)] +#[derive(Debug)] pub struct nsGetterAddRefs { pub mTargetSmartPtr: *mut nsCOMPtr, pub _phantom0: ::std::marker::PhantomData, } #[repr(C)] +#[derive(Debug)] pub struct nsAutoPtr { pub mRawPtr: *mut T, } @@ -2158,6 +2179,7 @@ pub struct nsAutoPtr_Ptr { pub mPtr: *mut T, } #[repr(C)] +#[derive(Debug)] pub struct nsAutoPtr_Proxy { pub mRawPtr: *mut T, pub _phantom0: ::std::marker::PhantomData, @@ -2184,6 +2206,7 @@ fn bindgen_test_layout_PLDHashEntryHdr() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct Checker { pub mState: u32, pub mIsWritable: u32, @@ -2200,13 +2223,12 @@ pub struct PLDHashTable { pub mEntrySize: u32, pub mEntryCount: u32, pub mRemovedCount: u32, - pub mEntryStore: PLDHashTable_EntryStore, + pub mEntryStore: [u64; 2usize], pub mChecker: Checker, } #[repr(C)] pub struct PLDHashTable_EntryStore { - pub mEntryStore: *mut ::std::os::raw::c_char, - pub mGeneration: u32, + pub _bindgen_opaque_blob: [u64; 2usize], } #[test] fn bindgen_test_layout_PLDHashTable_EntryStore() { @@ -2214,6 +2236,7 @@ fn bindgen_test_layout_PLDHashTable_EntryStore() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct PLDHashTable_Iterator { pub mTable: *mut PLDHashTable, pub mStart: *mut ::std::os::raw::c_char, @@ -2344,17 +2367,13 @@ pub struct nsTHashtable { pub _phantom0: ::std::marker::PhantomData, } #[repr(C)] +#[derive(Debug)] pub struct nsTHashtable_Iterator { pub _base: PLDHashTable_Iterator, pub _phantom0: ::std::marker::PhantomData, } #[repr(C)] pub struct nsDataHashtable; -#[test] -fn bindgen_test_layout_nsDataHashtable() { - assert_eq!(::std::mem::size_of::() , 0usize); - assert_eq!(::std::mem::align_of::() , 0usize); -} pub enum CSSVariableResolver { } #[repr(C)] pub struct CSSVariableValues { @@ -2362,6 +2381,7 @@ pub struct CSSVariableValues { pub mVariables: u64, } #[repr(C)] +#[derive(Debug)] pub struct CSSVariableValues_Variable { pub mVariableName: nsString, pub mValue: nsString, @@ -2847,6 +2867,7 @@ pub enum QuotedName { eQuotedName = 0, eUnquotedName = 1, } * a font type indicated named family or which generic family */ #[repr(C)] +#[derive(Debug)] pub struct FontFamilyName { pub mType: FontFamilyType, pub mName: nsString, @@ -2886,6 +2907,7 @@ fn bindgen_test_layout_gfxFontFeature() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct gfxAlternateValue { pub alternate: u32, pub value: nsString, @@ -2984,11 +3006,11 @@ impl ::std::clone::Clone for nsIURI { fn clone(&self) -> Self { *self } } pub const eCSSProperty_COUNT_DUMMY: nsCSSProperty = - nsCSSProperty::eCSSProperty__x_text_zoom; -pub const eCSSProperty__moz_outline_radius: nsCSSProperty = + nsCSSProperty::eCSSProperty_z_index; +pub const eCSSProperty_all: nsCSSProperty = nsCSSProperty::eCSSProperty_COUNT_no_shorthands; pub const eCSSProperty_COUNT_DUMMY2: nsCSSProperty = - nsCSSProperty::eCSSProperty__moz_transform; + nsCSSProperty::eCSSProperty_transition; pub const eCSSPropertyAlias_MozTransformOrigin: nsCSSProperty = nsCSSProperty::eCSSProperty_COUNT; pub const eCSSProperty_COUNT_DUMMY3: nsCSSProperty = @@ -2999,48 +3021,48 @@ pub const eCSSPropertyExtra_no_properties: nsCSSProperty = #[derive(Debug, Copy, Clone)] pub enum nsCSSProperty { eCSSProperty_UNKNOWN = -1, - eCSSProperty_appearance = 0, - eCSSProperty__moz_outline_radius_topLeft = 1, - eCSSProperty__moz_outline_radius_topRight = 2, - eCSSProperty__moz_outline_radius_bottomRight = 3, - eCSSProperty__moz_outline_radius_bottomLeft = 4, - eCSSProperty__moz_tab_size = 5, - eCSSProperty__x_system_font = 6, - eCSSProperty_animation_delay = 7, - eCSSProperty_animation_direction = 8, - eCSSProperty_animation_duration = 9, - eCSSProperty_animation_fill_mode = 10, - eCSSProperty_animation_iteration_count = 11, - eCSSProperty_animation_name = 12, - eCSSProperty_animation_play_state = 13, - eCSSProperty_animation_timing_function = 14, - eCSSProperty_background_attachment = 15, - eCSSProperty_background_clip = 16, - eCSSProperty_background_color = 17, - eCSSProperty_background_image = 18, - eCSSProperty_background_blend_mode = 19, - eCSSProperty_background_origin = 20, - eCSSProperty_background_position = 21, - eCSSProperty_background_repeat = 22, - eCSSProperty_background_size = 23, - eCSSProperty_binding = 24, - eCSSProperty_block_size = 25, - eCSSProperty_border_block_end_color = 26, - eCSSProperty_border_block_end_style = 27, - eCSSProperty_border_block_end_width = 28, - eCSSProperty_border_block_start_color = 29, - eCSSProperty_border_block_start_style = 30, - eCSSProperty_border_block_start_width = 31, - eCSSProperty_border_bottom_color = 32, - eCSSProperty_border_bottom_colors = 33, + eCSSProperty_align_content = 0, + eCSSProperty_align_items = 1, + eCSSProperty_align_self = 2, + 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_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 = 19, + eCSSProperty_background_repeat = 20, + eCSSProperty_background_size = 21, + eCSSProperty_binding = 22, + eCSSProperty_block_size = 23, + eCSSProperty_border_block_end_color = 24, + eCSSProperty_border_block_end_style = 25, + eCSSProperty_border_block_end_width = 26, + eCSSProperty_border_block_start_color = 27, + eCSSProperty_border_block_start_style = 28, + eCSSProperty_border_block_start_width = 29, + eCSSProperty_border_bottom_color = 30, + eCSSProperty_border_bottom_colors = 31, + eCSSProperty_border_bottom_left_radius = 32, + eCSSProperty_border_bottom_right_radius = 33, eCSSProperty_border_bottom_style = 34, eCSSProperty_border_bottom_width = 35, eCSSProperty_border_collapse = 36, - eCSSProperty_border_image_source = 37, - eCSSProperty_border_image_slice = 38, - eCSSProperty_border_image_width = 39, - eCSSProperty_border_image_outset = 40, - eCSSProperty_border_image_repeat = 41, + eCSSProperty_border_image_outset = 37, + eCSSProperty_border_image_repeat = 38, + eCSSProperty_border_image_slice = 39, + eCSSProperty_border_image_source = 40, + eCSSProperty_border_image_width = 41, eCSSProperty_border_inline_end_color = 42, eCSSProperty_border_inline_end_style = 43, eCSSProperty_border_inline_end_width = 44, @@ -3058,290 +3080,290 @@ pub enum nsCSSProperty { eCSSProperty_border_spacing = 56, eCSSProperty_border_top_color = 57, eCSSProperty_border_top_colors = 58, - eCSSProperty_border_top_style = 59, - eCSSProperty_border_top_width = 60, - eCSSProperty_border_top_left_radius = 61, - eCSSProperty_border_top_right_radius = 62, - eCSSProperty_border_bottom_right_radius = 63, - eCSSProperty_border_bottom_left_radius = 64, - eCSSProperty_bottom = 65, - eCSSProperty_box_decoration_break = 66, - eCSSProperty_box_shadow = 67, - eCSSProperty_box_sizing = 68, - eCSSProperty_caption_side = 69, - eCSSProperty_clear = 70, - eCSSProperty_clip = 71, - eCSSProperty_color = 72, - eCSSProperty_color_adjust = 73, - eCSSProperty__moz_column_count = 74, - eCSSProperty__moz_column_fill = 75, - eCSSProperty__moz_column_width = 76, - eCSSProperty__moz_column_gap = 77, - eCSSProperty__moz_column_rule_color = 78, - eCSSProperty__moz_column_rule_style = 79, - eCSSProperty__moz_column_rule_width = 80, - eCSSProperty_contain = 81, - eCSSProperty_content = 82, - eCSSProperty__moz_control_character_visibility = 83, - eCSSProperty_counter_increment = 84, - eCSSProperty_counter_reset = 85, - eCSSProperty_cursor = 86, - eCSSProperty_direction = 87, - eCSSProperty_display = 88, - eCSSProperty_empty_cells = 89, - eCSSProperty_align_content = 90, - eCSSProperty_align_items = 91, - eCSSProperty_align_self = 92, - eCSSProperty_flex_basis = 93, - eCSSProperty_flex_direction = 94, - eCSSProperty_webkit_box_orient = 95, - eCSSProperty_flex_grow = 96, - eCSSProperty_flex_shrink = 97, - eCSSProperty_flex_wrap = 98, - eCSSProperty_order = 99, - eCSSProperty_justify_content = 100, - eCSSProperty_justify_items = 101, - eCSSProperty_justify_self = 102, - eCSSProperty_float = 103, - eCSSProperty_float_edge = 104, - eCSSProperty_font_family = 105, - eCSSProperty_font_feature_settings = 106, - eCSSProperty_font_kerning = 107, - eCSSProperty_font_language_override = 108, - eCSSProperty_font_size = 109, - eCSSProperty_font_size_adjust = 110, - eCSSProperty_osx_font_smoothing = 111, - eCSSProperty_font_stretch = 112, - eCSSProperty_font_style = 113, - eCSSProperty_font_synthesis = 114, - eCSSProperty_font_variant_alternates = 115, - eCSSProperty_font_variant_caps = 116, - eCSSProperty_font_variant_east_asian = 117, - eCSSProperty_font_variant_ligatures = 118, - eCSSProperty_font_variant_numeric = 119, - eCSSProperty_font_variant_position = 120, - eCSSProperty_font_weight = 121, - eCSSProperty_force_broken_image_icon = 122, - eCSSProperty_grid_auto_flow = 123, - eCSSProperty_grid_auto_columns = 124, - eCSSProperty_grid_auto_rows = 125, - eCSSProperty_grid_template_areas = 126, - eCSSProperty_grid_template_columns = 127, - eCSSProperty_grid_template_rows = 128, - eCSSProperty_grid_column_start = 129, - eCSSProperty_grid_column_end = 130, - eCSSProperty_grid_row_start = 131, - eCSSProperty_grid_row_end = 132, - eCSSProperty_grid_column_gap = 133, - eCSSProperty_grid_row_gap = 134, - eCSSProperty_height = 135, - eCSSProperty_image_orientation = 136, - eCSSProperty_image_region = 137, - eCSSProperty_ime_mode = 138, - eCSSProperty_inline_size = 139, - eCSSProperty_left = 140, - eCSSProperty_letter_spacing = 141, - eCSSProperty_line_height = 142, - eCSSProperty_list_style_image = 143, - eCSSProperty_list_style_position = 144, - eCSSProperty_list_style_type = 145, - eCSSProperty_margin_block_end = 146, - eCSSProperty_margin_block_start = 147, - eCSSProperty_margin_bottom = 148, - eCSSProperty_margin_inline_end = 149, - eCSSProperty_margin_inline_start = 150, - eCSSProperty_margin_left = 151, - eCSSProperty_margin_right = 152, - eCSSProperty_margin_top = 153, - eCSSProperty_marker_offset = 154, - eCSSProperty_max_block_size = 155, - eCSSProperty_max_height = 156, - eCSSProperty_max_inline_size = 157, - eCSSProperty_max_width = 158, - eCSSProperty__moz_min_font_size_ratio = 159, - eCSSProperty_min_height = 160, - eCSSProperty_min_block_size = 161, - eCSSProperty_min_inline_size = 162, - eCSSProperty_min_width = 163, - eCSSProperty_mix_blend_mode = 164, - eCSSProperty_isolation = 165, - eCSSProperty_object_fit = 166, - eCSSProperty_object_position = 167, - eCSSProperty_offset_block_end = 168, - eCSSProperty_offset_block_start = 169, - eCSSProperty_offset_inline_end = 170, - eCSSProperty_offset_inline_start = 171, - eCSSProperty_opacity = 172, - eCSSProperty_orient = 173, - eCSSProperty_outline_color = 174, - eCSSProperty_outline_style = 175, - eCSSProperty_outline_width = 176, - eCSSProperty_outline_offset = 177, - eCSSProperty_overflow_clip_box = 178, - eCSSProperty_overflow_x = 179, - eCSSProperty_overflow_y = 180, - eCSSProperty_padding_block_end = 181, - eCSSProperty_padding_block_start = 182, - eCSSProperty_padding_bottom = 183, - eCSSProperty_padding_inline_end = 184, - eCSSProperty_padding_inline_start = 185, - eCSSProperty_padding_left = 186, - eCSSProperty_padding_right = 187, - eCSSProperty_padding_top = 188, - eCSSProperty_page_break_after = 189, - eCSSProperty_page_break_before = 190, - eCSSProperty_page_break_inside = 191, - eCSSProperty_paint_order = 192, - eCSSProperty_pointer_events = 193, - eCSSProperty_position = 194, - eCSSProperty_quotes = 195, - eCSSProperty_resize = 196, - eCSSProperty_right = 197, - eCSSProperty_ruby_align = 198, - eCSSProperty_ruby_position = 199, - eCSSProperty_scroll_behavior = 200, - eCSSProperty_scroll_snap_coordinate = 201, - eCSSProperty_scroll_snap_destination = 202, - eCSSProperty_scroll_snap_points_x = 203, - eCSSProperty_scroll_snap_points_y = 204, - eCSSProperty_scroll_snap_type_x = 205, - eCSSProperty_scroll_snap_type_y = 206, - eCSSProperty_table_layout = 207, - eCSSProperty_text_align = 208, - eCSSProperty_text_align_last = 209, - eCSSProperty_text_combine_upright = 210, - eCSSProperty_text_decoration_color = 211, - eCSSProperty_text_decoration_line = 212, - eCSSProperty_text_decoration_style = 213, - eCSSProperty_text_emphasis_color = 214, - eCSSProperty_text_emphasis_position = 215, - eCSSProperty_text_emphasis_style = 216, - eCSSProperty__webkit_text_fill_color = 217, - eCSSProperty_text_indent = 218, - eCSSProperty_text_orientation = 219, - eCSSProperty_text_overflow = 220, - eCSSProperty_text_shadow = 221, - eCSSProperty_text_size_adjust = 222, - eCSSProperty_text_transform = 223, - eCSSProperty_transform = 224, - eCSSProperty_transform_box = 225, - eCSSProperty_transform_origin = 226, - eCSSProperty_perspective_origin = 227, - eCSSProperty_perspective = 228, - eCSSProperty_transform_style = 229, - eCSSProperty_backface_visibility = 230, - eCSSProperty_top = 231, - eCSSProperty__moz_top_layer = 232, - eCSSProperty_touch_action = 233, - eCSSProperty_transition_delay = 234, - eCSSProperty_transition_duration = 235, - eCSSProperty_transition_property = 236, - eCSSProperty_transition_timing_function = 237, - eCSSProperty_unicode_bidi = 238, - eCSSProperty_user_focus = 239, - eCSSProperty_user_input = 240, - eCSSProperty_user_modify = 241, - eCSSProperty_user_select = 242, - eCSSProperty_vertical_align = 243, - eCSSProperty_visibility = 244, - eCSSProperty_white_space = 245, - eCSSProperty_width = 246, - eCSSProperty__moz_window_dragging = 247, - eCSSProperty__moz_window_shadow = 248, - eCSSProperty_word_break = 249, - eCSSProperty_word_spacing = 250, - eCSSProperty_word_wrap = 251, - eCSSProperty_hyphens = 252, - eCSSProperty_writing_mode = 253, - eCSSProperty_z_index = 254, - eCSSProperty_box_align = 255, - eCSSProperty_box_direction = 256, - eCSSProperty_box_flex = 257, - eCSSProperty_box_orient = 258, - eCSSProperty_box_pack = 259, - eCSSProperty_box_ordinal_group = 260, - eCSSProperty_stack_sizing = 261, - eCSSProperty_script_level = 262, - eCSSProperty_script_size_multiplier = 263, - eCSSProperty_script_min_size = 264, - eCSSProperty_math_variant = 265, - eCSSProperty_math_display = 266, - eCSSProperty_clip_path = 267, - eCSSProperty_clip_rule = 268, - eCSSProperty_color_interpolation = 269, - eCSSProperty_color_interpolation_filters = 270, - eCSSProperty_dominant_baseline = 271, - eCSSProperty_fill = 272, - eCSSProperty_fill_opacity = 273, - eCSSProperty_fill_rule = 274, - eCSSProperty_filter = 275, - eCSSProperty_flood_color = 276, - eCSSProperty_flood_opacity = 277, - eCSSProperty_image_rendering = 278, - eCSSProperty_lighting_color = 279, - eCSSProperty_marker_end = 280, - eCSSProperty_marker_mid = 281, - eCSSProperty_marker_start = 282, - eCSSProperty_mask = 283, - eCSSProperty_mask_type = 284, - eCSSProperty_shape_rendering = 285, - eCSSProperty_stop_color = 286, - eCSSProperty_stop_opacity = 287, - eCSSProperty_stroke = 288, - eCSSProperty_stroke_dasharray = 289, - eCSSProperty_stroke_dashoffset = 290, - eCSSProperty_stroke_linecap = 291, - eCSSProperty_stroke_linejoin = 292, - eCSSProperty_stroke_miterlimit = 293, - eCSSProperty_stroke_opacity = 294, - eCSSProperty_stroke_width = 295, - eCSSProperty_text_anchor = 296, - eCSSProperty_text_rendering = 297, - eCSSProperty_vector_effect = 298, - eCSSProperty_will_change = 299, - eCSSProperty__x_lang = 300, - eCSSProperty__x_span = 301, - eCSSProperty__x_text_zoom = 302, + eCSSProperty_border_top_left_radius = 59, + eCSSProperty_border_top_right_radius = 60, + eCSSProperty_border_top_style = 61, + eCSSProperty_border_top_width = 62, + eCSSProperty_bottom = 63, + eCSSProperty_box_align = 64, + eCSSProperty_box_decoration_break = 65, + eCSSProperty_box_direction = 66, + eCSSProperty_box_flex = 67, + eCSSProperty_box_ordinal_group = 68, + eCSSProperty_box_orient = 69, + eCSSProperty_webkit_box_orient = 70, + eCSSProperty_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, + eCSSProperty_color_adjust = 80, + eCSSProperty_color_interpolation = 81, + eCSSProperty_color_interpolation_filters = 82, + eCSSProperty__moz_column_count = 83, + eCSSProperty__moz_column_fill = 84, + eCSSProperty__moz_column_gap = 85, + eCSSProperty__moz_column_rule_color = 86, + eCSSProperty__moz_column_rule_style = 87, + eCSSProperty__moz_column_rule_width = 88, + eCSSProperty__moz_column_width = 89, + eCSSProperty_contain = 90, + eCSSProperty_content = 91, + eCSSProperty__moz_control_character_visibility = 92, + eCSSProperty_counter_increment = 93, + eCSSProperty_counter_reset = 94, + eCSSProperty_cursor = 95, + eCSSProperty_direction = 96, + eCSSProperty_display = 97, + eCSSProperty_dominant_baseline = 98, + eCSSProperty_empty_cells = 99, + eCSSProperty_fill = 100, + eCSSProperty_fill_opacity = 101, + 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_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, + eCSSProperty_font_stretch = 119, + eCSSProperty_font_style = 120, + eCSSProperty_font_synthesis = 121, + 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_weight = 128, + eCSSProperty_force_broken_image_icon = 129, + eCSSProperty_grid_auto_columns = 130, + eCSSProperty_grid_auto_flow = 131, + eCSSProperty_grid_auto_rows = 132, + eCSSProperty_grid_column_end = 133, + eCSSProperty_grid_column_gap = 134, + eCSSProperty_grid_column_start = 135, + eCSSProperty_grid_row_end = 136, + eCSSProperty_grid_row_gap = 137, + eCSSProperty_grid_row_start = 138, + eCSSProperty_grid_template_areas = 139, + eCSSProperty_grid_template_columns = 140, + eCSSProperty_grid_template_rows = 141, + eCSSProperty_height = 142, + eCSSProperty_hyphens = 143, + eCSSProperty_image_orientation = 144, + eCSSProperty_image_region = 145, + eCSSProperty_image_rendering = 146, + eCSSProperty_ime_mode = 147, + eCSSProperty_inline_size = 148, + eCSSProperty_isolation = 149, + eCSSProperty_justify_content = 150, + eCSSProperty_justify_items = 151, + eCSSProperty_justify_self = 152, + eCSSProperty__x_lang = 153, + eCSSProperty_left = 154, + eCSSProperty_letter_spacing = 155, + eCSSProperty_lighting_color = 156, + eCSSProperty_line_height = 157, + eCSSProperty_list_style_image = 158, + eCSSProperty_list_style_position = 159, + eCSSProperty_list_style_type = 160, + eCSSProperty_margin_block_end = 161, + eCSSProperty_margin_block_start = 162, + eCSSProperty_margin_bottom = 163, + eCSSProperty_margin_inline_end = 164, + eCSSProperty_margin_inline_start = 165, + eCSSProperty_margin_left = 166, + eCSSProperty_margin_right = 167, + eCSSProperty_margin_top = 168, + eCSSProperty_marker_end = 169, + eCSSProperty_marker_mid = 170, + eCSSProperty_marker_offset = 171, + eCSSProperty_marker_start = 172, + eCSSProperty_mask = 173, + eCSSProperty_mask_type = 174, + eCSSProperty_math_display = 175, + eCSSProperty_math_variant = 176, + eCSSProperty_max_block_size = 177, + eCSSProperty_max_height = 178, + eCSSProperty_max_inline_size = 179, + eCSSProperty_max_width = 180, + eCSSProperty_min_block_size = 181, + eCSSProperty__moz_min_font_size_ratio = 182, + eCSSProperty_min_height = 183, + eCSSProperty_min_inline_size = 184, + eCSSProperty_min_width = 185, + eCSSProperty_mix_blend_mode = 186, + eCSSProperty_object_fit = 187, + eCSSProperty_object_position = 188, + eCSSProperty_offset_block_end = 189, + eCSSProperty_offset_block_start = 190, + eCSSProperty_offset_inline_end = 191, + eCSSProperty_offset_inline_start = 192, + eCSSProperty_opacity = 193, + eCSSProperty_order = 194, + eCSSProperty_orient = 195, + eCSSProperty_osx_font_smoothing = 196, + eCSSProperty_outline_color = 197, + eCSSProperty_outline_offset = 198, + eCSSProperty__moz_outline_radius_bottomLeft = 199, + eCSSProperty__moz_outline_radius_bottomRight = 200, + eCSSProperty__moz_outline_radius_topLeft = 201, + eCSSProperty__moz_outline_radius_topRight = 202, + eCSSProperty_outline_style = 203, + eCSSProperty_outline_width = 204, + eCSSProperty_overflow_clip_box = 205, + eCSSProperty_overflow_x = 206, + eCSSProperty_overflow_y = 207, + eCSSProperty_padding_block_end = 208, + eCSSProperty_padding_block_start = 209, + eCSSProperty_padding_bottom = 210, + eCSSProperty_padding_inline_end = 211, + eCSSProperty_padding_inline_start = 212, + eCSSProperty_padding_left = 213, + eCSSProperty_padding_right = 214, + eCSSProperty_padding_top = 215, + eCSSProperty_page_break_after = 216, + eCSSProperty_page_break_before = 217, + eCSSProperty_page_break_inside = 218, + eCSSProperty_paint_order = 219, + eCSSProperty_perspective = 220, + eCSSProperty_perspective_origin = 221, + eCSSProperty_pointer_events = 222, + eCSSProperty_position = 223, + eCSSProperty_quotes = 224, + eCSSProperty_resize = 225, + eCSSProperty_right = 226, + eCSSProperty_ruby_align = 227, + eCSSProperty_ruby_position = 228, + eCSSProperty_script_level = 229, + eCSSProperty_script_min_size = 230, + eCSSProperty_script_size_multiplier = 231, + eCSSProperty_scroll_behavior = 232, + eCSSProperty_scroll_snap_coordinate = 233, + eCSSProperty_scroll_snap_destination = 234, + eCSSProperty_scroll_snap_points_x = 235, + eCSSProperty_scroll_snap_points_y = 236, + eCSSProperty_scroll_snap_type_x = 237, + eCSSProperty_scroll_snap_type_y = 238, + eCSSProperty_shape_rendering = 239, + eCSSProperty__x_span = 240, + eCSSProperty_stack_sizing = 241, + eCSSProperty_stop_color = 242, + eCSSProperty_stop_opacity = 243, + eCSSProperty_stroke = 244, + eCSSProperty_stroke_dasharray = 245, + eCSSProperty_stroke_dashoffset = 246, + eCSSProperty_stroke_linecap = 247, + eCSSProperty_stroke_linejoin = 248, + eCSSProperty_stroke_miterlimit = 249, + eCSSProperty_stroke_opacity = 250, + eCSSProperty_stroke_width = 251, + eCSSProperty__x_system_font = 252, + eCSSProperty__moz_tab_size = 253, + eCSSProperty_table_layout = 254, + eCSSProperty_text_align = 255, + eCSSProperty_text_align_last = 256, + eCSSProperty_text_anchor = 257, + eCSSProperty_text_combine_upright = 258, + eCSSProperty_text_decoration_color = 259, + eCSSProperty_text_decoration_line = 260, + eCSSProperty_text_decoration_style = 261, + eCSSProperty_text_emphasis_color = 262, + eCSSProperty_text_emphasis_position = 263, + eCSSProperty_text_emphasis_style = 264, + eCSSProperty__webkit_text_fill_color = 265, + eCSSProperty_text_indent = 266, + eCSSProperty_text_orientation = 267, + eCSSProperty_text_overflow = 268, + eCSSProperty_text_rendering = 269, + eCSSProperty_text_shadow = 270, + eCSSProperty_text_size_adjust = 271, + eCSSProperty_text_transform = 272, + eCSSProperty__x_text_zoom = 273, + eCSSProperty_top = 274, + eCSSProperty__moz_top_layer = 275, + eCSSProperty_touch_action = 276, + eCSSProperty_transform = 277, + eCSSProperty_transform_box = 278, + eCSSProperty_transform_origin = 279, + eCSSProperty_transform_style = 280, + eCSSProperty_transition_delay = 281, + eCSSProperty_transition_duration = 282, + eCSSProperty_transition_property = 283, + eCSSProperty_transition_timing_function = 284, + eCSSProperty_unicode_bidi = 285, + eCSSProperty_user_focus = 286, + eCSSProperty_user_input = 287, + eCSSProperty_user_modify = 288, + eCSSProperty_user_select = 289, + eCSSProperty_vector_effect = 290, + eCSSProperty_vertical_align = 291, + eCSSProperty_visibility = 292, + eCSSProperty_white_space = 293, + eCSSProperty_width = 294, + eCSSProperty_will_change = 295, + eCSSProperty__moz_window_dragging = 296, + eCSSProperty__moz_window_shadow = 297, + eCSSProperty_word_break = 298, + eCSSProperty_word_spacing = 299, + eCSSProperty_word_wrap = 300, + eCSSProperty_writing_mode = 301, + eCSSProperty_z_index = 302, eCSSProperty_COUNT_no_shorthands = 303, - eCSSProperty_all = 304, - eCSSProperty_animation = 305, - eCSSProperty_background = 306, - eCSSProperty_border = 307, - eCSSProperty_border_block_end = 308, - eCSSProperty_border_block_start = 309, - eCSSProperty_border_bottom = 310, - eCSSProperty_border_color = 311, - eCSSProperty_border_image = 312, - eCSSProperty_border_inline_end = 313, - eCSSProperty_border_inline_start = 314, - eCSSProperty_border_left = 315, + eCSSProperty_animation = 304, + eCSSProperty_background = 305, + eCSSProperty_border = 306, + eCSSProperty_border_block_end = 307, + eCSSProperty_border_block_start = 308, + eCSSProperty_border_bottom = 309, + eCSSProperty_border_color = 310, + eCSSProperty_border_image = 311, + eCSSProperty_border_inline_end = 312, + eCSSProperty_border_inline_start = 313, + eCSSProperty_border_left = 314, + eCSSProperty_border_radius = 315, eCSSProperty_border_right = 316, eCSSProperty_border_style = 317, eCSSProperty_border_top = 318, eCSSProperty_border_width = 319, - eCSSProperty_border_radius = 320, + eCSSProperty__moz_column_rule = 320, eCSSProperty__moz_columns = 321, - eCSSProperty__moz_column_rule = 322, - eCSSProperty_flex = 323, - eCSSProperty_flex_flow = 324, - eCSSProperty_font = 325, - eCSSProperty_font_variant = 326, - eCSSProperty_grid = 327, + eCSSProperty_flex = 322, + eCSSProperty_flex_flow = 323, + eCSSProperty_font = 324, + eCSSProperty_font_variant = 325, + eCSSProperty_grid = 326, + eCSSProperty_grid_area = 327, eCSSProperty_grid_column = 328, - eCSSProperty_grid_row = 329, - eCSSProperty_grid_area = 330, - eCSSProperty_grid_gap = 331, - eCSSProperty_list_style = 332, - eCSSProperty_margin = 333, + eCSSProperty_grid_gap = 329, + eCSSProperty_grid_row = 330, + eCSSProperty_list_style = 331, + eCSSProperty_margin = 332, + eCSSProperty_marker = 333, eCSSProperty_outline = 334, - eCSSProperty_overflow = 335, - eCSSProperty_padding = 336, - eCSSProperty_scroll_snap_type = 337, - eCSSProperty_text_decoration = 338, - eCSSProperty_text_emphasis = 339, - eCSSProperty_transition = 340, - eCSSProperty_marker = 341, - eCSSProperty__moz_transform = 342, + eCSSProperty__moz_outline_radius = 335, + eCSSProperty_overflow = 336, + eCSSProperty_padding = 337, + eCSSProperty_scroll_snap_type = 338, + eCSSProperty_text_decoration = 339, + eCSSProperty_text_emphasis = 340, + eCSSProperty__moz_transform = 341, + eCSSProperty_transition = 342, eCSSProperty_COUNT = 343, eCSSPropertyAlias_MozPerspectiveOrigin = 344, eCSSPropertyAlias_MozPerspective = 345, @@ -3480,6 +3502,7 @@ pub type nscolor = u32; * count is 1. */ #[repr(C)] +#[derive(Debug)] pub struct nsStringBuffer { pub mRefCount: u32, pub mStorageSize: u32, @@ -3509,6 +3532,7 @@ fn bindgen_test_layout_ImageValue() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct GridNamedArea { pub mName: nsString, pub mColumnStart: u32, @@ -3631,6 +3655,7 @@ pub enum nsCSSUnit { eCSSUnit_FlexFraction = 4000, } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValue { pub mUnit: nsCSSUnit, pub mValue: nsCSSValue_nsCSSValue_h_unnamed_8, @@ -3680,6 +3705,7 @@ fn bindgen_test_layout_nsCSSValue() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct Array { pub mRefCnt: usize, pub mCount: usize, @@ -3691,6 +3717,7 @@ fn bindgen_test_layout_Array() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueList { pub mValue: nsCSSValue, pub mNext: *mut nsCSSValueList, @@ -3701,6 +3728,7 @@ fn bindgen_test_layout_nsCSSValueList() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueList_heap { pub _base: nsCSSValueList, pub mRefCnt: nsAutoRefCnt, @@ -3712,6 +3740,7 @@ fn bindgen_test_layout_nsCSSValueList_heap() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueSharedList { pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, @@ -3723,6 +3752,7 @@ fn bindgen_test_layout_nsCSSValueSharedList() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSRect { pub mTop: nsCSSValue, pub mRight: nsCSSValue, @@ -3735,6 +3765,7 @@ fn bindgen_test_layout_nsCSSRect() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSRect_heap { pub _base: nsCSSRect, pub mRefCnt: nsAutoRefCnt, @@ -3746,6 +3777,7 @@ fn bindgen_test_layout_nsCSSRect_heap() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValuePair { pub mXValue: nsCSSValue, pub mYValue: nsCSSValue, @@ -3756,6 +3788,7 @@ fn bindgen_test_layout_nsCSSValuePair() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValuePair_heap { pub _base: nsCSSValuePair, pub mRefCnt: nsAutoRefCnt, @@ -3767,6 +3800,7 @@ fn bindgen_test_layout_nsCSSValuePair_heap() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueTriplet { pub mXValue: nsCSSValue, pub mYValue: nsCSSValue, @@ -3778,6 +3812,7 @@ fn bindgen_test_layout_nsCSSValueTriplet() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueTriplet_heap { pub _base: nsCSSValueTriplet, pub mRefCnt: nsAutoRefCnt, @@ -3789,6 +3824,7 @@ fn bindgen_test_layout_nsCSSValueTriplet_heap() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValuePairList { pub mXValue: nsCSSValue, pub mYValue: nsCSSValue, @@ -3800,6 +3836,7 @@ fn bindgen_test_layout_nsCSSValuePairList() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValuePairList_heap { pub _base: nsCSSValuePairList, pub mRefCnt: nsAutoRefCnt, @@ -3811,6 +3848,7 @@ fn bindgen_test_layout_nsCSSValuePairList_heap() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueGradientStop { pub mLocation: nsCSSValue, pub mColor: nsCSSValue, @@ -3859,6 +3897,7 @@ fn bindgen_test_layout_nsCSSValueTokenStream() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSValueFloatColor { pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, @@ -3873,6 +3912,7 @@ fn bindgen_test_layout_nsCSSValueFloatColor() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSCornerSizes { pub mTopLeft: nsCSSValue, pub mTopRight: nsCSSValue, @@ -3989,6 +4029,7 @@ fn bindgen_test_layout_nsIAtom() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsAtomString { pub _base: nsString, } @@ -3998,6 +4039,7 @@ fn bindgen_test_layout_nsAtomString() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsAtomCString { pub _base: nsCString, } @@ -4018,6 +4060,7 @@ pub struct nsDependentAtomString { * and ->Release() called on it. */ #[repr(C)] +#[derive(Debug)] pub struct HandleRefPtr { pub mHandle: T, } @@ -4048,6 +4091,7 @@ pub struct HandleRefPtr { * (or a proxy for it) in which the object was allocated. */ #[repr(C)] +#[derive(Debug)] pub struct ArenaRefPtr { pub mPtr: RefPtr, pub _phantom0: ::std::marker::PhantomData, @@ -4113,6 +4157,7 @@ pub type nsStyleUnion = nsStyleCoord_h_unnamed_10; * form. */ #[repr(C)] +#[derive(Debug)] pub struct nsStyleCoord { pub mUnit: nsStyleUnit, pub mValue: nsStyleUnion, @@ -4133,6 +4178,7 @@ fn bindgen_test_layout_nsStyleCoord_CalcValue() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleCoord_Calc { pub _base: nsStyleCoord_CalcValue, pub mRefCnt: nsAutoRefCnt, @@ -4157,6 +4203,7 @@ fn bindgen_test_layout_nsStyleCoord() { * or paddings of a box. */ #[repr(C)] +#[derive(Debug)] pub struct nsStyleSides { pub mUnits: [nsStyleUnit; 4usize], pub mValues: [nsStyleUnion; 4usize], @@ -4172,6 +4219,7 @@ fn bindgen_test_layout_nsStyleSides() { * corners of a box (for, e.g., border-radius and outline-radius). */ #[repr(C)] +#[derive(Debug)] pub struct nsStyleCorners { pub mUnits: [nsStyleUnit; 8usize], pub mValues: [nsStyleUnion; 8usize], @@ -4239,6 +4287,7 @@ fn bindgen_test_layout_nsStyleFont() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleGradientStop { pub mLocation: nsStyleCoord, pub mColor: nscolor, @@ -4320,6 +4369,7 @@ fn bindgen_test_layout_nsStyleImage() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleColor { pub mColor: nscolor, } @@ -4329,6 +4379,8 @@ fn bindgen_test_layout_nsStyleColor() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +pub struct nsStyleAutoArray; +#[repr(C)] pub struct nsStyleImageLayers { pub mAttachmentCount: u32, pub mClipCount: u32, @@ -4340,7 +4392,7 @@ pub struct nsStyleImageLayers { pub mMaskModeCount: u32, pub mBlendModeCount: u32, pub mCompositeCount: u32, - pub mLayers: [u64; 16usize], + pub mLayers: [u64; 15usize], } #[repr(u32)] #[derive(Debug, Copy, Clone)] @@ -4448,7 +4500,7 @@ fn bindgen_test_layout_nsStyleImageLayers_Layer() { } #[test] fn bindgen_test_layout_nsStyleImageLayers() { - assert_eq!(::std::mem::size_of::() , 168usize); + assert_eq!(::std::mem::size_of::() , 160usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] @@ -4458,10 +4510,11 @@ pub struct nsStyleBackground { } #[test] fn bindgen_test_layout_nsStyleBackground() { - assert_eq!(::std::mem::size_of::() , 176usize); + assert_eq!(::std::mem::size_of::() , 168usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleMargin { pub mMargin: nsStyleSides, pub mHasCachedMargin: bool, @@ -4473,6 +4526,7 @@ fn bindgen_test_layout_nsStyleMargin() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStylePadding { pub mPadding: nsStyleSides, pub mHasCachedPadding: bool, @@ -4484,6 +4538,7 @@ fn bindgen_test_layout_nsStylePadding() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsBorderColors { pub mNext: *mut nsBorderColors, pub mColor: nscolor, @@ -4494,6 +4549,7 @@ fn bindgen_test_layout_nsBorderColors() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSShadowItem { pub mXOffset: nscoord, pub mYOffset: nscoord, @@ -4509,6 +4565,7 @@ fn bindgen_test_layout_nsCSSShadowItem() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct nsCSSShadowArray { pub mRefCnt: nsAutoRefCnt, pub _mOwningThread: nsAutoOwningThread, @@ -4545,13 +4602,13 @@ fn bindgen_test_layout_nsStyleBorder() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleOutline { pub mOutlineRadius: nsStyleCorners, pub mOutlineWidth: nsStyleCoord, pub mOutlineOffset: nscoord, pub mCachedOutlineWidth: nscoord, pub mOutlineColor: nscolor, - pub mHasCachedOutline: bool, pub mOutlineStyle: u8, pub mTwipsPerPixel: nscoord, } @@ -4591,6 +4648,7 @@ fn bindgen_test_layout_nsStyleList() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleGridLine { pub mHasSpan: bool, pub mInteger: i32, @@ -4662,6 +4720,7 @@ fn bindgen_test_layout_nsStylePosition() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleTextOverflowSide { pub mString: nsString, pub mType: u8, @@ -4672,6 +4731,7 @@ fn bindgen_test_layout_nsStyleTextOverflowSide() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleTextOverflow { pub mLeft: nsStyleTextOverflowSide, pub mRight: nsStyleTextOverflowSide, @@ -4683,6 +4743,7 @@ fn bindgen_test_layout_nsStyleTextOverflow() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleTextReset { pub mTextOverflow: nsStyleTextOverflow, pub mTextDecorationLine: u8, @@ -4696,6 +4757,7 @@ fn bindgen_test_layout_nsStyleTextReset() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleText { pub mTextAlign: u8, pub mTextAlignLast: u8, @@ -4757,6 +4819,7 @@ fn bindgen_test_layout_nsStyleImageOrientation() { assert_eq!(::std::mem::align_of::() , 1usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleVisibility { pub mImageOrientation: nsStyleImageOrientation, pub mDirection: u8, @@ -4863,6 +4926,7 @@ fn bindgen_test_layout_nsTimingFunction() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct StyleTransition { pub mTimingFunction: nsTimingFunction, pub mDuration: f32, @@ -4876,6 +4940,7 @@ fn bindgen_test_layout_StyleTransition() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct StyleAnimation { pub mTimingFunction: nsTimingFunction, pub mDuration: f32, @@ -4913,7 +4978,7 @@ pub struct nsStyleDisplay { pub mIsolation: u8, pub mTopLayer: u8, pub mWillChangeBitField: u8, - pub mWillChange: [u64; 4usize], + pub mWillChange: u64, pub mTouchAction: u8, pub mScrollBehavior: u8, pub mScrollSnapTypeX: u8, @@ -4930,12 +4995,12 @@ pub struct nsStyleDisplay { pub mChildPerspective: nsStyleCoord, pub mPerspectiveOrigin: [nsStyleCoord; 2usize], pub mVerticalAlign: nsStyleCoord, - pub mTransitions: [u64; 7usize], + pub mTransitions: [u64; 6usize], pub mTransitionTimingFunctionCount: u32, pub mTransitionDurationCount: u32, pub mTransitionDelayCount: u32, pub mTransitionPropertyCount: u32, - pub mAnimations: [u64; 10usize], + pub mAnimations: [u64; 9usize], pub mAnimationTimingFunctionCount: u32, pub mAnimationDurationCount: u32, pub mAnimationDelayCount: u32, @@ -4947,10 +5012,11 @@ pub struct nsStyleDisplay { } #[test] fn bindgen_test_layout_nsStyleDisplay() { - assert_eq!(::std::mem::size_of::() , 448usize); + assert_eq!(::std::mem::size_of::() , 408usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleTable { pub mLayoutStrategy: u8, pub mSpan: i32, @@ -4961,6 +5027,7 @@ fn bindgen_test_layout_nsStyleTable() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleTableBorder { pub mBorderSpacingCol: nscoord, pub mBorderSpacingRow: nscoord, @@ -4989,6 +5056,7 @@ pub enum nsStyleContentType { eStyleContentType_Uninitialized = 51, } #[repr(C)] +#[derive(Debug)] pub struct nsStyleContentData { pub mType: nsStyleContentType, pub mContent: nsStyleContentData_nsStyleStruct_h_unnamed_18, @@ -5019,6 +5087,7 @@ fn bindgen_test_layout_nsStyleContentData() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleCounterData { pub mCounter: nsString, pub mValue: i32, @@ -5029,6 +5098,7 @@ fn bindgen_test_layout_nsStyleCounterData() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleContent { pub mMarkerOffset: nsStyleCoord, pub mContents: *mut nsStyleContentData, @@ -5044,6 +5114,7 @@ fn bindgen_test_layout_nsStyleContent() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleUIReset { pub mUserSelect: u8, pub mForceBrokenImageIcon: u8, @@ -5069,6 +5140,7 @@ fn bindgen_test_layout_nsCursorImage() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleUserInterface { pub mUserInput: u8, pub mUserModify: u8, @@ -5084,6 +5156,7 @@ fn bindgen_test_layout_nsStyleUserInterface() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleXUL { pub mBoxFlex: f32, pub mBoxOrdinal: u32, @@ -5099,6 +5172,7 @@ fn bindgen_test_layout_nsStyleXUL() { assert_eq!(::std::mem::align_of::() , 4usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleColumn { pub mColumnCount: u32, pub mColumnWidth: nsStyleCoord, @@ -5132,6 +5206,7 @@ pub enum nsStyleSVGOpacitySource { eStyleSVGOpacitySource_ContextStrokeOpacity = 2, } #[repr(C)] +#[derive(Debug)] pub struct nsStyleSVGPaint { pub mPaint: nsStyleSVGPaint_nsStyleStruct_h_unnamed_19, pub mType: nsStyleSVGPaintType, @@ -5161,6 +5236,7 @@ fn bindgen_test_layout_nsStyleSVGPaint() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleSVG { pub mFill: nsStyleSVGPaint, pub mStroke: nsStyleSVGPaint, @@ -5183,8 +5259,7 @@ pub struct nsStyleSVG { pub mStrokeLinecap: u8, pub mStrokeLinejoin: u8, pub mTextAnchor: u8, - pub _bitfield_1: u8, - pub _bitfield_2: u8, + pub _bitfield_1: u32, } #[test] fn bindgen_test_layout_nsStyleSVG() { @@ -5215,6 +5290,7 @@ fn bindgen_test_layout_nsStyleBasicShape() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleClipPath { pub mType: i32, pub nsStyleClipPath_nsStyleStruct_h_unnamed_20: nsStyleClipPath_nsStyleStruct_h_unnamed_20, @@ -5244,6 +5320,7 @@ fn bindgen_test_layout_nsStyleClipPath() { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] +#[derive(Debug)] pub struct nsStyleFilter { pub mType: i32, pub mFilterParameter: nsStyleCoord, @@ -5293,7 +5370,7 @@ pub struct nsStyleSVGReset { } #[test] fn bindgen_test_layout_nsStyleSVGReset() { - assert_eq!(::std::mem::size_of::() , 216usize); + assert_eq!(::std::mem::size_of::() , 208usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] diff --git a/ports/geckolib/properties.mako.rs b/ports/geckolib/properties.mako.rs index b7522cf4a08..3c1bba7c758 100644 --- a/ports/geckolib/properties.mako.rs +++ b/ports/geckolib/properties.mako.rs @@ -230,6 +230,10 @@ impl HeapSizeOf for ${style_struct.gecko_ffi_name} { // Not entirely accurate, but good enough for now. fn heap_size_of_children(&self) -> usize { 0 } } + +// FIXME(bholley): Make bindgen generate Debug for all types. +%if style_struct.gecko_ffi_name in "nsStyleBorder nsStylePosition nsStyleDisplay nsStyleList nsStyleBackground "\ + "nsStyleFont nsStyleEffects nsStyleSVGReset".split(): impl Debug for ${style_struct.gecko_ffi_name} { // FIXME(bholley): Generate this. fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -237,6 +241,7 @@ impl Debug for ${style_struct.gecko_ffi_name} { } } %endif +%endif <%def name="raw_impl_trait(style_struct, skip_longhands='', skip_additionals='')"> diff --git a/ports/geckolib/tools/regen_style_structs.sh b/ports/geckolib/tools/regen_style_structs.sh index a0d95608eaf..a00f8df9750 100755 --- a/ports/geckolib/tools/regen_style_structs.sh +++ b/ports/geckolib/tools/regen_style_structs.sh @@ -116,6 +116,7 @@ fi -opaque-type "nsIntPoint" \ -opaque-type "nsIntRect" \ -opaque-type "nsTArray" \ + -opaque-type "nsStyleAutoArray" \ -opaque-type "nsCOMArray" \ -opaque-type "nsDependentString" \ -opaque-type "EntryStore" \