Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17016 - upsuper:bug1366735, r=heycam

Browse source 
Use struct rather than nsCSSValue::Array to store counter functions in Gecko

This is the Servo side change for [bug 1366735](https://bugzilla.mozilla.org/show_bug.cgi?id=1366735).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17016)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-24 17:26:03 -05:00 • committed by GitHub
commit e457d22f81
5 changed files with 154 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

57
components/style/gecko/generated/structs_debug.rs
View file

@ -32010,11 +32010,66 @@ pub mod root {
pub mContent: root::nsStyleContentData__bindgen_ty_1,
}
#[repr(C)]
#[derive(Debug)]
pub struct nsStyleContentData_CounterFunction {
pub mIdent: ::nsstring::nsStringRepr,
pub mSeparator: ::nsstring::nsStringRepr,
pub mCounterStyle: root::mozilla::CounterStylePtr,
pub mCounterStyleName: root::nsCOMPtr<root::nsIAtom>,
pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
}
pub type nsStyleContentData_CounterFunction_HasThreadSafeRefCnt =
root::mozilla::TrueType;
#[test]
fn bindgen_test_layout_nsStyleContentData_CounterFunction() {
assert_eq!(::std::mem::size_of::<nsStyleContentData_CounterFunction>()
, 56usize , concat ! (
"Size of: " , stringify ! (
nsStyleContentData_CounterFunction ) ));
assert_eq! (::std::mem::align_of::<nsStyleContentData_CounterFunction>()
, 8usize , concat ! (
"Alignment of " , stringify ! (
nsStyleContentData_CounterFunction ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContentData_CounterFunction )
) . mIdent as * const _ as usize } , 0usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleContentData_CounterFunction ) , "::" , stringify !
( mIdent ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContentData_CounterFunction )
) . mSeparator as * const _ as usize } , 16usize , concat
! (
"Alignment of field: " , stringify ! (
nsStyleContentData_CounterFunction ) , "::" , stringify !
( mSeparator ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContentData_CounterFunction )
) . mCounterStyle as * const _ as usize } , 32usize ,
concat ! (
"Alignment of field: " , stringify ! (
nsStyleContentData_CounterFunction ) , "::" , stringify !
( mCounterStyle ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContentData_CounterFunction )
) . mCounterStyleName as * const _ as usize } , 40usize ,
concat ! (
"Alignment of field: " , stringify ! (
nsStyleContentData_CounterFunction ) , "::" , stringify !
( mCounterStyleName ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleContentData_CounterFunction )
) . mRefCnt as * const _ as usize } , 48usize , concat ! (
"Alignment of field: " , stringify ! (
nsStyleContentData_CounterFunction ) , "::" , stringify !
( mRefCnt ) ));
}
#[repr(C)]
#[derive(Debug, Copy)]
pub struct nsStyleContentData__bindgen_ty_1 {
pub mString: root::__BindgenUnionField<*mut u16>,
pub mImage: root::__BindgenUnionField<*mut root::nsStyleImageRequest>,
pub mCounters: root::__BindgenUnionField<*mut root::nsCSSValue_Array>,
pub mCounters: root::__BindgenUnionField<*mut root::nsStyleContentData_CounterFunction>,
pub bindgen_union_field: u64,
}
#[test]