Update bindings for StyleImageLayerRepeat

This commit is contained in:
Manish Goregaokar 2017-06-09 13:26:16 -07:00
parent e46aa87b4c
commit fd0ac4f31e
3 changed files with 32 additions and 29 deletions

View file

@ -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_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_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_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_CONTAIN: ::std::os::raw::c_uint = 0;
pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1; 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; pub const NS_STYLE_MASK_MODE_ALPHA: ::std::os::raw::c_uint = 0;
@ -6420,6 +6413,16 @@ pub mod root {
} }
#[repr(u8)] #[repr(u8)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[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 { pub enum StyleDisplay {
None = 0, None = 0,
Block = 1, Block = 1,
@ -29977,8 +29980,8 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)] #[derive(Debug, Copy)]
pub struct nsStyleImageLayers_Repeat { pub struct nsStyleImageLayers_Repeat {
pub mXRepeat: u8, pub mXRepeat: root::mozilla::StyleImageLayerRepeat,
pub mYRepeat: u8, pub mYRepeat: root::mozilla::StyleImageLayerRepeat,
} }
#[test] #[test]
fn bindgen_test_layout_nsStyleImageLayers_Repeat() { fn bindgen_test_layout_nsStyleImageLayers_Repeat() {

View file

@ -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_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_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_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_CONTAIN: ::std::os::raw::c_uint = 0;
pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1; 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; pub const NS_STYLE_MASK_MODE_ALPHA: ::std::os::raw::c_uint = 0;
@ -6276,6 +6269,16 @@ pub mod root {
} }
#[repr(u8)] #[repr(u8)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[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 { pub enum StyleDisplay {
None = 0, None = 0,
Block = 1, Block = 1,
@ -29432,8 +29435,8 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)] #[derive(Debug, Copy)]
pub struct nsStyleImageLayers_Repeat { pub struct nsStyleImageLayers_Repeat {
pub mXRepeat: u8, pub mXRepeat: root::mozilla::StyleImageLayerRepeat,
pub mYRepeat: u8, pub mYRepeat: root::mozilla::StyleImageLayerRepeat,
} }
#[test] #[test]
fn bindgen_test_layout_nsStyleImageLayers_Repeat() { fn bindgen_test_layout_nsStyleImageLayers_Repeat() {

View file

@ -2989,25 +2989,22 @@ fn static_assert() {
<%self:simple_image_array_property name="repeat" shorthand="${shorthand}" field_name="mRepeat"> <%self:simple_image_array_property name="repeat" shorthand="${shorthand}" field_name="mRepeat">
use properties::longhands::${shorthand}_repeat::single_value::computed_value::RepeatKeyword; use properties::longhands::${shorthand}_repeat::single_value::computed_value::RepeatKeyword;
use gecko_bindings::structs::nsStyleImageLayers_Repeat; use gecko_bindings::structs::nsStyleImageLayers_Repeat;
use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_REPEAT; use gecko_bindings::structs::StyleImageLayerRepeat;
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;
fn to_ns(repeat: RepeatKeyword) -> u32 { fn to_ns(repeat: RepeatKeyword) -> StyleImageLayerRepeat {
match repeat { match repeat {
RepeatKeyword::Repeat => NS_STYLE_IMAGELAYER_REPEAT_REPEAT, RepeatKeyword::Repeat => StyleImageLayerRepeat::Repeat,
RepeatKeyword::Space => NS_STYLE_IMAGELAYER_REPEAT_SPACE, RepeatKeyword::Space => StyleImageLayerRepeat::Space,
RepeatKeyword::Round => NS_STYLE_IMAGELAYER_REPEAT_ROUND, RepeatKeyword::Round => StyleImageLayerRepeat::Round,
RepeatKeyword::NoRepeat => NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT, RepeatKeyword::NoRepeat => StyleImageLayerRepeat::NoRepeat,
} }
} }
let repeat_x = to_ns(servo.0); let repeat_x = to_ns(servo.0);
let repeat_y = to_ns(servo.1); let repeat_y = to_ns(servo.1);
nsStyleImageLayers_Repeat { nsStyleImageLayers_Repeat {
mXRepeat: repeat_x as u8, mXRepeat: repeat_x,
mYRepeat: repeat_y as u8, mYRepeat: repeat_y,
} }
</%self:simple_image_array_property> </%self:simple_image_array_property>