Skip to content

Commit

Permalink
Stylo - update bindings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenpighead
chenpighead committed Apr 11, 2017
1 parent a460585 commit b5a0032
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 64 deletions.
32 changes: 30 additions & 2 deletions components/style/gecko_bindings/bindings.rs
View file
Expand Up @@ -16,9 +16,11 @@ use gecko_bindings::structs::RawGeckoAnimationValueList;
use gecko_bindings::structs::RawServoAnimationValue;
use gecko_bindings::structs::RawServoAnimationValueMap;
use gecko_bindings::structs::RawServoDeclarationBlock;
use gecko_bindings::structs::RawServoStyleRule;
use gecko_bindings::structs::RawGeckoPresContext;
use gecko_bindings::structs::RawGeckoPresContextOwned;
use gecko_bindings::structs::RawGeckoStyleAnimationList;
use gecko_bindings::structs::RawGeckoServoStyleRuleList;
use gecko_bindings::structs::RawGeckoURLExtraData;
use gecko_bindings::structs::RefPtr;
use gecko_bindings::structs::CSSPseudoClassType;
Expand All @@ -28,6 +30,7 @@ use gecko_bindings::structs::ComputedTimingFunction_BeforeFlag;
use gecko_bindings::structs::FontFamilyList;
use gecko_bindings::structs::FontFamilyType;
use gecko_bindings::structs::FontSizePrefs;
use gecko_bindings::structs::GeckoFontMetrics;
use gecko_bindings::structs::Keyframe;
use gecko_bindings::structs::ServoBundledURI;
use gecko_bindings::structs::ServoElementSnapshot;
Expand Down Expand Up @@ -207,8 +210,6 @@ pub type RawServoDeclarationBlockBorrowedOrNull<'a> = Option<&'a RawServoDeclara
pub type RawServoStyleRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoStyleRule>;
pub type RawServoStyleRuleBorrowed<'a> = &'a RawServoStyleRule;
pub type RawServoStyleRuleBorrowedOrNull<'a> = Option<&'a RawServoStyleRule>;
enum RawServoStyleRuleVoid { }
pub struct RawServoStyleRule(RawServoStyleRuleVoid);
pub type RawServoImportRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoImportRule>;
pub type RawServoImportRuleBorrowed<'a> = &'a RawServoImportRule;
pub type RawServoImportRuleBorrowedOrNull<'a> = Option<&'a RawServoImportRule>;
Expand Down Expand Up @@ -306,6 +307,10 @@ pub type RawGeckoFontFaceRuleListBorrowed<'a> = &'a RawGeckoFontFaceRuleList;
pub type RawGeckoFontFaceRuleListBorrowedOrNull<'a> = Option<&'a RawGeckoFontFaceRuleList>;
pub type RawGeckoFontFaceRuleListBorrowedMut<'a> = &'a mut RawGeckoFontFaceRuleList;
pub type RawGeckoFontFaceRuleListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoFontFaceRuleList>;
pub type RawGeckoServoStyleRuleListBorrowed<'a> = &'a RawGeckoServoStyleRuleList;
pub type RawGeckoServoStyleRuleListBorrowedOrNull<'a> = Option<&'a RawGeckoServoStyleRuleList>;
pub type RawGeckoServoStyleRuleListBorrowedMut<'a> = &'a mut RawGeckoServoStyleRuleList;
pub type RawGeckoServoStyleRuleListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoStyleRuleList>;

extern "C" {
pub fn Gecko_EnsureTArrayCapacity(aArray: *mut ::std::os::raw::c_void,
Expand Down Expand Up @@ -699,6 +704,18 @@ extern "C" {
extern "C" {
pub fn Gecko_CopyFontFamilyFrom(dst: *mut nsFont, src: *const nsFont);
}
extern "C" {
pub fn Gecko_SetImageOrientation(aVisibility: *mut nsStyleVisibility,
aRadians: f64, aFlip: bool);
}
extern "C" {
pub fn Gecko_SetImageOrientationAsFromImage(aVisibility:
*mut nsStyleVisibility);
}
extern "C" {
pub fn Gecko_CopyImageOrientationFrom(aDst: *mut nsStyleVisibility,
aSrc: *const nsStyleVisibility);
}
extern "C" {
pub fn Gecko_SetListStyleType(style_struct: *mut nsStyleList, type_: u32);
}
Expand Down Expand Up @@ -1076,6 +1093,12 @@ extern "C" {
extern "C" {
pub fn Gecko_GetBaseSize(lang: *mut nsIAtom) -> FontSizePrefs;
}
extern "C" {
pub fn Gecko_GetFontMetrics(pres_context: RawGeckoPresContextBorrowed,
is_vertical: bool, font: *const nsStyleFont,
font_size: nscoord, use_user_font_set: bool)
-> GeckoFontMetrics;
}
extern "C" {
pub fn Gecko_GetMediaFeatures() -> *const nsMediaFeature;
}
Expand Down Expand Up @@ -1911,6 +1934,11 @@ extern "C" {
pub fn Servo_Element_GetSnapshot(element: RawGeckoElementBorrowed)
-> *mut ServoElementSnapshot;
}
extern "C" {
pub fn Servo_Element_GetStyleRuleList(element: RawGeckoElementBorrowed,
rules:
RawGeckoServoStyleRuleListBorrowedMut);
}
extern "C" {
pub fn Servo_NoteExplicitHints(element: RawGeckoElementBorrowed,
restyle_hint: nsRestyleHint,
Expand Down
101 changes: 70 additions & 31 deletions components/style/gecko_bindings/structs_debug.rs
View file
Expand Up @@ -23700,6 +23700,8 @@ pub mod root {
pub mModeFlags: root::nsStyleImageRequest_Mode,
pub mResolved: bool,
}
pub type nsStyleImageRequest_URLValueData =
root::mozilla::css::URLValueData;
#[repr(u8)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum nsStyleImageRequest_Mode { Track = 1, Discard = 2, }
Expand Down Expand Up @@ -23758,6 +23760,7 @@ pub mod root {
eStyleImageType_Image = 1,
eStyleImageType_Gradient = 2,
eStyleImageType_Element = 3,
eStyleImageType_URL = 4,
}
#[repr(C)]
#[derive(Debug)]
Expand Down Expand Up @@ -23808,11 +23811,14 @@ pub mod root {
pub mCropRect: root::mozilla::UniquePtr<root::nsStyleSides,
root::mozilla::DefaultDelete<root::nsStyleSides>>,
}
pub type nsStyleImage_URLValue = root::mozilla::css::URLValue;
pub type nsStyleImage_URLValueData = root::mozilla::css::URLValueData;
#[repr(C)]
#[derive(Debug, Copy)]
pub struct nsStyleImage__bindgen_ty_1 {
pub mImage: root::__BindgenUnionField<*mut root::nsStyleImageRequest>,
pub mGradient: root::__BindgenUnionField<*mut root::nsStyleGradient>,
pub mURLValue: root::__BindgenUnionField<*mut root::nsStyleImage_URLValue>,
pub mElementId: root::__BindgenUnionField<*mut u16>,
pub bindgen_union_field: u64,
}
Expand All @@ -23838,6 +23844,12 @@ pub mod root {
"Alignment of field: " , stringify ! (
nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! (
mGradient ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) .
mURLValue as * const _ as usize } , 0usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImage__bindgen_ty_1 ) , "::" , stringify ! (
mURLValue ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImage__bindgen_ty_1 ) ) .
mElementId as * const _ as usize } , 0usize , concat ! (
Expand Down Expand Up @@ -24066,7 +24078,6 @@ pub mod root {
#[derive(Debug)]
pub struct nsStyleImageLayers_Layer {
pub mImage: root::nsStyleImage,
pub mSourceURI: root::RefPtr<root::mozilla::css::URLValueData>,
pub mPosition: root::mozilla::Position,
pub mSize: root::nsStyleImageLayers_Size,
pub mClip: root::nsStyleImageLayers_Layer_StyleGeometryBox,
Expand All @@ -24081,8 +24092,8 @@ pub mod root {
nsStyleImageLayers_Layer_StyleGeometryBox;
#[test]
fn bindgen_test_layout_nsStyleImageLayers_Layer() {
assert_eq!(::std::mem::size_of::<nsStyleImageLayers_Layer>() ,
104usize , concat ! (
assert_eq!(::std::mem::size_of::<nsStyleImageLayers_Layer>() , 96usize
, concat ! (
"Size of: " , stringify ! ( nsStyleImageLayers_Layer ) ));
assert_eq! (::std::mem::align_of::<nsStyleImageLayers_Layer>() ,
8usize , concat ! (
Expand All @@ -24096,61 +24107,55 @@ pub mod root {
));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mSourceURI as * const _ as usize } , 32usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mSourceURI ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mPosition as * const _ as usize } , 40usize , concat ! (
mPosition as * const _ as usize } , 32usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mPosition ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mSize
as * const _ as usize } , 64usize , concat ! (
as * const _ as usize } , 56usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! ( mSize )
));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) . mClip
as * const _ as usize } , 92usize , concat ! (
as * const _ as usize } , 84usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! ( mClip )
));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mOrigin as * const _ as usize } , 93usize , concat ! (
mOrigin as * const _ as usize } , 85usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! ( mOrigin
) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mAttachment as * const _ as usize } , 94usize , concat ! (
mAttachment as * const _ as usize } , 86usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mAttachment ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mBlendMode as * const _ as usize } , 95usize , concat ! (
mBlendMode as * const _ as usize } , 87usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mBlendMode ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mComposite as * const _ as usize } , 96usize , concat ! (
mComposite as * const _ as usize } , 88usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mComposite ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mMaskMode as * const _ as usize } , 97usize , concat ! (
mMaskMode as * const _ as usize } , 89usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! (
mMaskMode ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleImageLayers_Layer ) ) .
mRepeat as * const _ as usize } , 98usize , concat ! (
mRepeat as * const _ as usize } , 90usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleImageLayers_Layer ) , "::" , stringify ! ( mRepeat
) ));
Expand All @@ -24167,7 +24172,7 @@ pub mod root {
}
#[test]
fn bindgen_test_layout_nsStyleImageLayers() {
assert_eq!(::std::mem::size_of::<nsStyleImageLayers>() , 160usize ,
assert_eq!(::std::mem::size_of::<nsStyleImageLayers>() , 152usize ,
concat ! ( "Size of: " , stringify ! ( nsStyleImageLayers )
));
assert_eq! (::std::mem::align_of::<nsStyleImageLayers>() , 8usize ,
Expand Down Expand Up @@ -24248,7 +24253,7 @@ pub mod root {
}
#[test]
fn bindgen_test_layout_nsStyleBackground() {
assert_eq!(::std::mem::size_of::<nsStyleBackground>() , 168usize ,
assert_eq!(::std::mem::size_of::<nsStyleBackground>() , 160usize ,
concat ! ( "Size of: " , stringify ! ( nsStyleBackground )
));
assert_eq! (::std::mem::align_of::<nsStyleBackground>() , 8usize ,
Expand All @@ -24261,7 +24266,7 @@ pub mod root {
, "::" , stringify ! ( mImage ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleBackground ) ) .
mBackgroundColor as * const _ as usize } , 160usize ,
mBackgroundColor as * const _ as usize } , 152usize ,
concat ! (
"Alignment of field: " , stringify ! ( nsStyleBackground )
, "::" , stringify ! ( mBackgroundColor ) ));
Expand Down Expand Up @@ -26362,7 +26367,7 @@ pub mod root {
}
#[test]
fn bindgen_test_layout_nsStyleSVGReset() {
assert_eq!(::std::mem::size_of::<nsStyleSVGReset>() , 200usize ,
assert_eq!(::std::mem::size_of::<nsStyleSVGReset>() , 192usize ,
concat ! ( "Size of: " , stringify ! ( nsStyleSVGReset )
));
assert_eq! (::std::mem::align_of::<nsStyleSVGReset>() , 8usize ,
Expand All @@ -26375,48 +26380,48 @@ pub mod root {
"::" , stringify ! ( mMask ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mClipPath as *
const _ as usize } , 160usize , concat ! (
const _ as usize } , 152usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mClipPath ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mStopColor as *
const _ as usize } , 176usize , concat ! (
const _ as usize } , 168usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mStopColor ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodColor as
* const _ as usize } , 180usize , concat ! (
* const _ as usize } , 172usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mFloodColor ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mLightingColor
as * const _ as usize } , 184usize , concat ! (
as * const _ as usize } , 176usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mLightingColor ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mStopOpacity as
* const _ as usize } , 188usize , concat ! (
* const _ as usize } , 180usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mStopOpacity ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mFloodOpacity
as * const _ as usize } , 192usize , concat ! (
as * const _ as usize } , 184usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mFloodOpacity ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) .
mDominantBaseline as * const _ as usize } , 196usize ,
mDominantBaseline as * const _ as usize } , 188usize ,
concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mDominantBaseline ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mVectorEffect
as * const _ as usize } , 197usize , concat ! (
as * const _ as usize } , 189usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mVectorEffect ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleSVGReset ) ) . mMaskType as *
const _ as usize } , 198usize , concat ! (
const _ as usize } , 190usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleSVGReset ) ,
"::" , stringify ! ( mMaskType ) ));
}
Expand Down Expand Up @@ -26659,6 +26664,9 @@ pub mod root {
pub struct RawServoDeclarationBlock([u8; 0]);
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct RawServoStyleRule([u8; 0]);
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct RawServoAnimationValue([u8; 0]);
#[repr(C)]
#[derive(Debug, Copy, Clone)]
Expand All @@ -26680,6 +26688,8 @@ pub mod root {
pub type RawGeckoAnimationPropertySegment =
root::mozilla::AnimationPropertySegment;
pub type RawGeckoComputedTiming = root::mozilla::ComputedTiming;
pub type RawGeckoServoStyleRuleList =
root::nsTArray<*const root::RawServoStyleRule>;
pub type RawServoAnimationValueMapBorrowed =
*const root::RawServoAnimationValueMap;
pub type RawGeckoNodeBorrowed = *const root::RawGeckoNode;
Expand All @@ -26706,6 +26716,8 @@ pub mod root {
*const root::RawGeckoAnimationPropertySegment;
pub type RawGeckoComputedTimingBorrowed =
*const root::RawGeckoComputedTiming;
pub type RawGeckoServoStyleRuleListBorrowedMut =
*mut root::RawGeckoServoStyleRuleList;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct nsSVGAngle([u8; 0]);
Expand Down Expand Up @@ -27213,6 +27225,33 @@ pub mod root {
fn clone(&self) -> Self { *self }
}
#[repr(C)]
#[derive(Debug, Copy)]
pub struct GeckoFontMetrics {
pub mChSize: root::nscoord,
pub mXSize: root::nscoord,
}
#[test]
fn bindgen_test_layout_GeckoFontMetrics() {
assert_eq!(::std::mem::size_of::<GeckoFontMetrics>() , 8usize , concat
! ( "Size of: " , stringify ! ( GeckoFontMetrics ) ));
assert_eq! (::std::mem::align_of::<GeckoFontMetrics>() , 4usize ,
concat ! (
"Alignment of " , stringify ! ( GeckoFontMetrics ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const GeckoFontMetrics ) ) . mChSize as *
const _ as usize } , 0usize , concat ! (
"Alignment of field: " , stringify ! ( GeckoFontMetrics )
, "::" , stringify ! ( mChSize ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const GeckoFontMetrics ) ) . mXSize as *
const _ as usize } , 4usize , concat ! (
"Alignment of field: " , stringify ! ( GeckoFontMetrics )
, "::" , stringify ! ( mXSize ) ));
}
impl Clone for GeckoFontMetrics {
fn clone(&self) -> Self { *self }
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct nsROCSSPrimitiveValue([u8; 0]);
#[repr(C)]
Expand Down

0 comments on commit b5a0032

Please sign in to comment.