diff options
| -rw-r--r-- | components/style/gecko/generated/structs_debug.rs | 17 | ||||
| -rw-r--r-- | components/style/gecko/generated/structs_release.rs | 17 | ||||
| -rw-r--r-- | components/style/properties/gecko.mako.rs | 11 | ||||
| -rw-r--r-- | components/style/properties/longhand/xul.mako.rs | 6 |
4 files changed, 26 insertions, 25 deletions
diff --git a/components/style/gecko/generated/structs_debug.rs b/components/style/gecko/generated/structs_debug.rs index eed178533e2..2f8b574b209 100644 --- a/components/style/gecko/generated/structs_debug.rs +++ b/components/style/gecko/generated/structs_debug.rs @@ -185,9 +185,6 @@ pub mod root { pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.; pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0; pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1; - pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0; - pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint = - 1; pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0; pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1; pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2; @@ -6121,6 +6118,14 @@ pub mod root { } #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleStackSizing { + Ignore = 0, + StretchToFit = 1, + IgnoreHorizontal = 2, + IgnoreVertical = 3, + } + #[repr(u8)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum StyleTextJustify { None = 0, Auto = 1, @@ -30008,7 +30013,7 @@ pub mod root { pub mBoxDirection: root::mozilla::StyleBoxDirection, pub mBoxOrient: root::mozilla::StyleBoxOrient, pub mBoxPack: root::mozilla::StyleBoxPack, - pub mStretchStack: bool, + pub mStackSizing: root::mozilla::StyleStackSizing, } #[test] fn bindgen_test_layout_nsStyleXUL() { @@ -30047,10 +30052,10 @@ pub mod root { "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxPack ) )); assert_eq! (unsafe { - & ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as * + & ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" - , stringify ! ( mStretchStack ) )); + , stringify ! ( mStackSizing ) )); } #[repr(C)] #[derive(Debug)] diff --git a/components/style/gecko/generated/structs_release.rs b/components/style/gecko/generated/structs_release.rs index fc4051c6d5d..78760c4956b 100644 --- a/components/style/gecko/generated/structs_release.rs +++ b/components/style/gecko/generated/structs_release.rs @@ -185,9 +185,6 @@ pub mod root { pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.; pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0; pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1; - pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0; - pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint = - 1; pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0; pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1; pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2; @@ -5994,6 +5991,14 @@ pub mod root { } #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleStackSizing { + Ignore = 0, + StretchToFit = 1, + IgnoreHorizontal = 2, + IgnoreVertical = 3, + } + #[repr(u8)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum StyleTextJustify { None = 0, Auto = 1, @@ -29537,7 +29542,7 @@ pub mod root { pub mBoxDirection: root::mozilla::StyleBoxDirection, pub mBoxOrient: root::mozilla::StyleBoxOrient, pub mBoxPack: root::mozilla::StyleBoxPack, - pub mStretchStack: bool, + pub mStackSizing: root::mozilla::StyleStackSizing, } #[test] fn bindgen_test_layout_nsStyleXUL() { @@ -29576,10 +29581,10 @@ pub mod root { "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" , stringify ! ( mBoxPack ) )); assert_eq! (unsafe { - & ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as * + & ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as * const _ as usize } , 12usize , concat ! ( "Alignment of field: " , stringify ! ( nsStyleXUL ) , "::" - , stringify ! ( mStretchStack ) )); + , stringify ! ( mStackSizing ) )); } #[repr(C)] #[derive(Debug)] diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 599605c23af..4fd410c161f 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -4339,16 +4339,7 @@ clip-path </%self:impl_trait> <%self:impl_trait style_struct_name="XUL" - skip_longhands="-moz-stack-sizing -moz-box-ordinal-group"> - - #[allow(non_snake_case)] - pub fn set__moz_stack_sizing(&mut self, v: longhands::_moz_stack_sizing::computed_value::T) { - use properties::longhands::_moz_stack_sizing::computed_value::T; - self.gecko.mStretchStack = v == T::stretch_to_fit; - } - - ${impl_simple_copy('_moz_stack_sizing', 'mStretchStack')} - + skip_longhands="-moz-box-ordinal-group"> #[allow(non_snake_case)] pub fn set__moz_box_ordinal_group(&mut self, v: i32) { self.gecko.mBoxOrdinal = v as u32; diff --git a/components/style/properties/longhand/xul.mako.rs b/components/style/properties/longhand/xul.mako.rs index e86e3fc9ee1..e4b443364ab 100644 --- a/components/style/properties/longhand/xul.mako.rs +++ b/components/style/properties/longhand/xul.mako.rs @@ -44,9 +44,9 @@ ${helpers.single_keyword("-moz-box-pack", "start center end justify", alias="-webkit-box-pack", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)")} -${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore", - products="gecko", gecko_ffi_name="mStretchStack", - gecko_constant_prefix="NS_STYLE_STACK_SIZING", +${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore ignore-horizontal ignore-vertical", + products="gecko", gecko_ffi_name="mStackSizing", + gecko_enum_prefix="StyleStackSizing", animation_value_type="none", spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-stack-sizing)")} |