servo: Merge #18667 - Update debug bindings for removal of mFrameRefCnt (from Manishearth:bindingsup); r=emilio

r=emilio from https://bugzilla.mozilla.org/show_bug.cgi?id=1403808

Source-Repo: https://github.com/servo/servo
Source-Revision: c6f4ced45c277e69492966c0b8b2f63f257c3b88

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 09daa56cfc418945e21a38c808178d0cf21bb59a
This commit is contained in:
Manish Goregaokar 2017-09-28 20:15:51 -05:00
parent 51c6fc95ad
commit 2b4e108425

View file

@ -4424,7 +4424,7 @@ pub mod root {
} }
#[test] #[test]
fn bindgen_test_layout_ServoStyleContext() { fn bindgen_test_layout_ServoStyleContext() {
assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 264usize , assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 256usize ,
concat ! ( concat ! (
"Size of: " , stringify ! ( ServoStyleContext ) )); "Size of: " , stringify ! ( ServoStyleContext ) ));
assert_eq! (::std::mem::align_of::<ServoStyleContext>() , 8usize , assert_eq! (::std::mem::align_of::<ServoStyleContext>() , 8usize ,
@ -4433,28 +4433,28 @@ pub mod root {
)); ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) . & ( * ( 0 as * const ServoStyleContext ) ) .
mPresContext as * const _ as usize } , 24usize , mPresContext as * const _ as usize } , 16usize ,
concat ! ( concat ! (
"Alignment of field: " , stringify ! ( "Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( ServoStyleContext ) , "::" , stringify ! (
mPresContext ) )); mPresContext ) ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) . mSource & ( * ( 0 as * const ServoStyleContext ) ) . mSource
as * const _ as usize } , 32usize , concat ! ( as * const _ as usize } , 24usize , concat ! (
"Alignment of field: " , stringify ! ( "Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( mSource ) ServoStyleContext ) , "::" , stringify ! ( mSource )
)); ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) . & ( * ( 0 as * const ServoStyleContext ) ) .
mNextInheritingAnonBoxStyle as * const _ as usize } , mNextInheritingAnonBoxStyle as * const _ as usize } ,
248usize , concat ! ( 240usize , concat ! (
"Alignment of field: " , stringify ! ( "Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( ServoStyleContext ) , "::" , stringify ! (
mNextInheritingAnonBoxStyle ) )); mNextInheritingAnonBoxStyle ) ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) . & ( * ( 0 as * const ServoStyleContext ) ) .
mNextLazyPseudoStyle as * const _ as usize } , mNextLazyPseudoStyle as * const _ as usize } ,
256usize , concat ! ( 248usize , concat ! (
"Alignment of field: " , stringify ! ( "Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( ServoStyleContext ) , "::" , stringify ! (
mNextLazyPseudoStyle ) )); mNextLazyPseudoStyle ) ));
@ -19509,7 +19509,6 @@ pub mod root {
pub struct nsStyleContext { pub struct nsStyleContext {
pub mPseudoTag: root::RefPtr<root::nsIAtom>, pub mPseudoTag: root::RefPtr<root::nsIAtom>,
pub mBits: u64, pub mBits: u64,
pub mFrameRefCnt: u32,
} }
pub const nsStyleContext_kAllResolvedStructs: pub const nsStyleContext_kAllResolvedStructs:
root::nsStyleContext__bindgen_ty_1 = root::nsStyleContext__bindgen_ty_1 =
@ -19525,7 +19524,7 @@ pub mod root {
} }
#[test] #[test]
fn bindgen_test_layout_nsStyleContext() { fn bindgen_test_layout_nsStyleContext() {
assert_eq!(::std::mem::size_of::<nsStyleContext>() , 24usize , concat assert_eq!(::std::mem::size_of::<nsStyleContext>() , 16usize , concat
! ( "Size of: " , stringify ! ( nsStyleContext ) )); ! ( "Size of: " , stringify ! ( nsStyleContext ) ));
assert_eq! (::std::mem::align_of::<nsStyleContext>() , 8usize , concat assert_eq! (::std::mem::align_of::<nsStyleContext>() , 8usize , concat
! ( "Alignment of " , stringify ! ( nsStyleContext ) )); ! ( "Alignment of " , stringify ! ( nsStyleContext ) ));
@ -19539,11 +19538,6 @@ pub mod root {
_ as usize } , 8usize , concat ! ( _ as usize } , 8usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleContext ) , "Alignment of field: " , stringify ! ( nsStyleContext ) ,
"::" , stringify ! ( mBits ) )); "::" , stringify ! ( mBits ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContext ) ) . mFrameRefCnt as
* const _ as usize } , 16usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleContext ) ,
"::" , stringify ! ( mFrameRefCnt ) ));
} }
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]