diff options
| -rw-r--r-- | components/style/gecko/generated/structs_debug.rs | 21 | ||||
| -rw-r--r-- | components/style/gecko/generated/structs_release.rs | 21 | ||||
| -rw-r--r-- | components/style/properties/gecko.mako.rs | 19 |
3 files changed, 32 insertions, 29 deletions
diff --git a/components/style/gecko/generated/structs_debug.rs b/components/style/gecko/generated/structs_debug.rs index 7d9332cdbcb..a0a630f02c3 100644 --- a/components/style/gecko/generated/structs_debug.rs +++ b/components/style/gecko/generated/structs_debug.rs @@ -258,13 +258,6 @@ pub mod root { pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 4; pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 8; pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 16; - pub const NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT: ::std::os::raw::c_uint = - 0; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_X: ::std::os::raw::c_uint = 1; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_Y: ::std::os::raw::c_uint = 2; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT: ::std::os::raw::c_uint = 3; - pub const NS_STYLE_IMAGELAYER_REPEAT_SPACE: ::std::os::raw::c_uint = 4; - pub const NS_STYLE_IMAGELAYER_REPEAT_ROUND: ::std::os::raw::c_uint = 5; pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN: ::std::os::raw::c_uint = 0; pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1; pub const NS_STYLE_MASK_MODE_ALPHA: ::std::os::raw::c_uint = 0; @@ -6420,6 +6413,16 @@ pub mod root { } #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleImageLayerRepeat { + NoRepeat = 0, + RepeatX = 1, + RepeatY = 2, + Repeat = 3, + Space = 4, + Round = 5, + } + #[repr(u8)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum StyleDisplay { None = 0, Block = 1, @@ -29977,8 +29980,8 @@ pub mod root { #[repr(C)] #[derive(Debug, Copy)] pub struct nsStyleImageLayers_Repeat { - pub mXRepeat: u8, - pub mYRepeat: u8, + pub mXRepeat: root::mozilla::StyleImageLayerRepeat, + pub mYRepeat: root::mozilla::StyleImageLayerRepeat, } #[test] fn bindgen_test_layout_nsStyleImageLayers_Repeat() { diff --git a/components/style/gecko/generated/structs_release.rs b/components/style/gecko/generated/structs_release.rs index deed71460ab..a8b493e82b3 100644 --- a/components/style/gecko/generated/structs_release.rs +++ b/components/style/gecko/generated/structs_release.rs @@ -258,13 +258,6 @@ pub mod root { pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 4; pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 8; pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 16; - pub const NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT: ::std::os::raw::c_uint = - 0; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_X: ::std::os::raw::c_uint = 1; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_Y: ::std::os::raw::c_uint = 2; - pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT: ::std::os::raw::c_uint = 3; - pub const NS_STYLE_IMAGELAYER_REPEAT_SPACE: ::std::os::raw::c_uint = 4; - pub const NS_STYLE_IMAGELAYER_REPEAT_ROUND: ::std::os::raw::c_uint = 5; pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN: ::std::os::raw::c_uint = 0; pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1; pub const NS_STYLE_MASK_MODE_ALPHA: ::std::os::raw::c_uint = 0; @@ -6276,6 +6269,16 @@ pub mod root { } #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleImageLayerRepeat { + NoRepeat = 0, + RepeatX = 1, + RepeatY = 2, + Repeat = 3, + Space = 4, + Round = 5, + } + #[repr(u8)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum StyleDisplay { None = 0, Block = 1, @@ -29432,8 +29435,8 @@ pub mod root { #[repr(C)] #[derive(Debug, Copy)] pub struct nsStyleImageLayers_Repeat { - pub mXRepeat: u8, - pub mYRepeat: u8, + pub mXRepeat: root::mozilla::StyleImageLayerRepeat, + pub mYRepeat: root::mozilla::StyleImageLayerRepeat, } #[test] fn bindgen_test_layout_nsStyleImageLayers_Repeat() { diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 5b87bdc853d..382645dc7bb 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -2989,25 +2989,22 @@ fn static_assert() { <%self:simple_image_array_property name="repeat" shorthand="${shorthand}" field_name="mRepeat"> use properties::longhands::${shorthand}_repeat::single_value::computed_value::RepeatKeyword; use gecko_bindings::structs::nsStyleImageLayers_Repeat; - use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_REPEAT; - use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT; - use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_SPACE; - use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_ROUND; + use gecko_bindings::structs::StyleImageLayerRepeat; - fn to_ns(repeat: RepeatKeyword) -> u32 { + fn to_ns(repeat: RepeatKeyword) -> StyleImageLayerRepeat { match repeat { - RepeatKeyword::Repeat => NS_STYLE_IMAGELAYER_REPEAT_REPEAT, - RepeatKeyword::Space => NS_STYLE_IMAGELAYER_REPEAT_SPACE, - RepeatKeyword::Round => NS_STYLE_IMAGELAYER_REPEAT_ROUND, - RepeatKeyword::NoRepeat => NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT, + RepeatKeyword::Repeat => StyleImageLayerRepeat::Repeat, + RepeatKeyword::Space => StyleImageLayerRepeat::Space, + RepeatKeyword::Round => StyleImageLayerRepeat::Round, + RepeatKeyword::NoRepeat => StyleImageLayerRepeat::NoRepeat, } } let repeat_x = to_ns(servo.0); let repeat_y = to_ns(servo.1); nsStyleImageLayers_Repeat { - mXRepeat: repeat_x as u8, - mYRepeat: repeat_y as u8, + mXRepeat: repeat_x, + mYRepeat: repeat_y, } </%self:simple_image_array_property> |