--- a/layout/style/ServoTypes.h
+++ b/layout/style/ServoTypes.h
@@ -153,16 +153,17 @@ enum ServoKeywordSize {
// always guarantee that the interior representation
// of this is correct (the mKeyword field may have a different padding),
// but the entire struct should
// have the same size and alignment as the Rust version.
// Ensure layout tests get run if touching either side.
struct ServoFontComputationData {
ServoKeywordSize mKeyword;
float/*32_t*/ mRatio;
+ int32_t mAbsolute;
static_assert(sizeof(float) == 4, "float should be 32 bit");
};
struct ServoCustomPropertiesMap {
uintptr_t mPtr;
};
--- a/servo/components/style/gecko/generated/structs_debug.rs
+++ b/servo/components/style/gecko/generated/structs_debug.rs
@@ -4523,17 +4523,17 @@ pub mod root {
pub _base: root::nsStyleContext,
pub mPresContext: *mut root::nsPresContext,
pub mSource: root::ServoComputedData,
pub mNextInheritingAnonBoxStyle: root::RefPtr<root::mozilla::ServoStyleContext>,
pub mNextLazyPseudoStyle: root::RefPtr<root::mozilla::ServoStyleContext>,
}
#[test]
fn bindgen_test_layout_ServoStyleContext() {
- assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 272usize ,
+ assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 280usize ,
concat ! (
"Size of: " , stringify ! ( ServoStyleContext ) ));
assert_eq! (::std::mem::align_of::<ServoStyleContext>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( ServoStyleContext )
));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
@@ -4546,24 +4546,24 @@ pub mod root {
& ( * ( 0 as * const ServoStyleContext ) ) . mSource
as * const _ as usize } , 32usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( mSource )
));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
mNextInheritingAnonBoxStyle as * const _ as usize } ,
- 256usize , concat ! (
+ 264usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! (
mNextInheritingAnonBoxStyle ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
mNextLazyPseudoStyle as * const _ as usize } ,
- 264usize , concat ! (
+ 272usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! (
mNextLazyPseudoStyle ) ));
}
#[repr(C)]
#[derive(Debug)]
pub struct GeckoFont {
pub gecko: root::nsStyleFont,
@@ -14856,17 +14856,17 @@ pub mod root {
/// The element's computed values if visited, only computed if there's a
/// /// relevant link for this element. A element's "relevant link" is the
/// /// element being matched if it is a link or the nearest ancestor link.
pub visited_style: ::gecko_bindings::structs::ServoVisitedStyle,
pub font_computation_data: ::gecko_bindings::structs::ServoFontComputationData,
}
#[test]
fn bindgen_test_layout_ServoComputedData() {
- assert_eq!(::std::mem::size_of::<ServoComputedData>() , 224usize ,
+ assert_eq!(::std::mem::size_of::<ServoComputedData>() , 232usize ,
concat ! ( "Size of: " , stringify ! ( ServoComputedData )
));
assert_eq! (::std::mem::align_of::<ServoComputedData>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( ServoComputedData ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoComputedData ) ) . Font as *
const _ as usize } , 0usize , concat ! (
@@ -33298,17 +33298,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::gfx::FontVariation>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_207154_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_207155_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsCSSSelector>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsCSSSelector> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsCSSSelector>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsCSSSelector> ) ));
@@ -33654,17 +33654,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
assert_eq!(::std::mem::align_of::<::nsstring::nsStringRepr>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_209009_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_209010_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -33819,17 +33819,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::JS::DeletePolicy ) ));
assert_eq!(::std::mem::align_of::<root::JS::DeletePolicy>() , 1usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::JS::DeletePolicy ) ));
}
#[test]
- fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long__bindgen_ty_id_214626__bindgen_ty_id_214633_close0_instantiation() {
+ fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long__bindgen_ty_id_214627__bindgen_ty_id_214634_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::std::iterator>() , 1usize ,
concat ! (
"Size of template specialization: " , stringify ! (
root::std::iterator ) ));
assert_eq!(::std::mem::align_of::<root::std::iterator>() , 1usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::std::iterator ) ));
@@ -34093,17 +34093,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217161_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217162_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -34161,17 +34161,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIObserver> ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr<root::nsIObserver>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIObserver> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217466_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217467_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -34273,17 +34273,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::URLExtraData> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::URLExtraData>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::URLExtraData> ) ));
}
#[test]
- fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_218015_close0_instantiation() {
+ fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_218016_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::mozilla::NotNull<*const root::mozilla::Encoding>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::mozilla::NotNull<*const root::mozilla::Encoding> )
));
assert_eq!(::std::mem::align_of::<root::mozilla::NotNull<*const root::mozilla::Encoding>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
@@ -34688,17 +34688,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218441_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218442_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -34804,17 +34804,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::mozilla::ServoStyleSheet>>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::mozilla::ServoStyleSheet>>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218857_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218858_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -34949,17 +34949,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
assert_eq!(::std::mem::align_of::<::nsstring::nsStringRepr>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_219832_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_219833_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -35038,28 +35038,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::nsCSSFontFaceRule> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsCSSFontFaceRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsCSSFontFaceRule> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220144_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220145_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220149_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220150_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -35106,17 +35106,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::CSSStyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::CSSStyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::CSSStyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220645_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220646_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -35789,17 +35789,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIWeakReference> ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr<root::nsIWeakReference>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIWeakReference> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_223504_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_223505_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut ::std::os::raw::c_void>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut ::std::os::raw::c_void> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut ::std::os::raw::c_void>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut ::std::os::raw::c_void> ) ));
@@ -35857,17 +35857,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::mozilla::DefaultDelete ) ));
assert_eq!(::std::mem::align_of::<root::mozilla::DefaultDelete>() ,
1usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::mozilla::DefaultDelete ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229786_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229787_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::AudioContext>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::AudioContext> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::AudioContext>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::AudioContext> ) ));
@@ -35947,17 +35947,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::CycleCollectedJSContext_RunInMetastableStateData>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::CycleCollectedJSContext_RunInMetastableStateData>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_232431_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_232432_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
@@ -36164,17 +36164,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<f64> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<f64>>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<f64> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233819_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233820_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -36280,17 +36280,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) ));
assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsIAtom>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_236230_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_236231_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::CounterStyle>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::CounterStyle> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::CounterStyle>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::CounterStyle> ) ));
@@ -37183,17 +37183,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::nsStyleImageRequest> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsStyleImageRequest>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsStyleImageRequest> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_238845_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_238846_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
@@ -37420,28 +37420,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIURI> ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr<root::nsIURI>>() ,
8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr<root::nsIURI> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247161_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247162_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247166_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247167_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37519,17 +37519,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::ShadowRoot> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::dom::ShadowRoot>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::ShadowRoot> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247279_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_247280_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37806,17 +37806,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsAutoPtr<root::mozilla::dom::ExplicitChildIterator>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsAutoPtr<root::mozilla::dom::ExplicitChildIterator>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_248897_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_248898_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37828,28 +37828,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::Element> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249059_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249060_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249064_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249065_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37982,28 +37982,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::gfx::FontVariation>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252085_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252086_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252093_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252094_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
--- a/servo/components/style/gecko/generated/structs_release.rs
+++ b/servo/components/style/gecko/generated/structs_release.rs
@@ -4443,17 +4443,17 @@ pub mod root {
pub _base: root::nsStyleContext,
pub mPresContext: *mut root::nsPresContext,
pub mSource: root::ServoComputedData,
pub mNextInheritingAnonBoxStyle: root::RefPtr<root::mozilla::ServoStyleContext>,
pub mNextLazyPseudoStyle: root::RefPtr<root::mozilla::ServoStyleContext>,
}
#[test]
fn bindgen_test_layout_ServoStyleContext() {
- assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 264usize ,
+ assert_eq!(::std::mem::size_of::<ServoStyleContext>() , 272usize ,
concat ! (
"Size of: " , stringify ! ( ServoStyleContext ) ));
assert_eq! (::std::mem::align_of::<ServoStyleContext>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( ServoStyleContext )
));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
@@ -4466,24 +4466,24 @@ pub mod root {
& ( * ( 0 as * const ServoStyleContext ) ) . mSource
as * const _ as usize } , 24usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! ( mSource )
));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
mNextInheritingAnonBoxStyle as * const _ as usize } ,
- 248usize , concat ! (
+ 256usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! (
mNextInheritingAnonBoxStyle ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoStyleContext ) ) .
mNextLazyPseudoStyle as * const _ as usize } ,
- 256usize , concat ! (
+ 264usize , concat ! (
"Alignment of field: " , stringify ! (
ServoStyleContext ) , "::" , stringify ! (
mNextLazyPseudoStyle ) ));
}
#[repr(C)]
#[derive(Debug)]
pub struct GeckoFont {
pub gecko: root::nsStyleFont,
@@ -14703,17 +14703,17 @@ pub mod root {
/// The element's computed values if visited, only computed if there's a
/// /// relevant link for this element. A element's "relevant link" is the
/// /// element being matched if it is a link or the nearest ancestor link.
pub visited_style: ::gecko_bindings::structs::ServoVisitedStyle,
pub font_computation_data: ::gecko_bindings::structs::ServoFontComputationData,
}
#[test]
fn bindgen_test_layout_ServoComputedData() {
- assert_eq!(::std::mem::size_of::<ServoComputedData>() , 224usize ,
+ assert_eq!(::std::mem::size_of::<ServoComputedData>() , 232usize ,
concat ! ( "Size of: " , stringify ! ( ServoComputedData )
));
assert_eq! (::std::mem::align_of::<ServoComputedData>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( ServoComputedData ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const ServoComputedData ) ) . Font as *
const _ as usize } , 0usize , concat ! (
@@ -32884,17 +32884,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::gfx::FontVariation>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_204780_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_204781_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsCSSSelector>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsCSSSelector> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsCSSSelector>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsCSSSelector> ) ));
@@ -33240,17 +33240,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
assert_eq!(::std::mem::align_of::<::nsstring::nsStringRepr>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_206601_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_206602_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -33405,17 +33405,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::JS::DeletePolicy ) ));
assert_eq!(::std::mem::align_of::<root::JS::DeletePolicy>() , 1usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::JS::DeletePolicy ) ));
}
#[test]
- fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long__bindgen_ty_id_212190__bindgen_ty_id_212197_close0_instantiation() {
+ fn __bindgen_test_layout_iterator_open0_input_iterator_tag_UniquePtr_open1_JSErrorNotes_Note_DeletePolicy_open2_JSErrorNotes_Note_close2_close1_long__bindgen_ty_id_212191__bindgen_ty_id_212198_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::std::iterator>() , 1usize ,
concat ! (
"Size of template specialization: " , stringify ! (
root::std::iterator ) ));
assert_eq!(::std::mem::align_of::<root::std::iterator>() , 1usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::std::iterator ) ));
@@ -33679,17 +33679,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_214723_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_214724_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -33747,17 +33747,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr>() , 8usize , concat
! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_215028_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_215029_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -33859,17 +33859,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::URLExtraData> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::URLExtraData>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::URLExtraData> ) ));
}
#[test]
- fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_215577_close0_instantiation() {
+ fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_215578_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::mozilla::NotNull<*const root::mozilla::Encoding>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::mozilla::NotNull<*const root::mozilla::Encoding> )
));
assert_eq!(::std::mem::align_of::<root::mozilla::NotNull<*const root::mozilla::Encoding>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
@@ -34272,17 +34272,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::StyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216001_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216002_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -34388,17 +34388,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::mozilla::ServoStyleSheet>>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::mozilla::ServoStyleSheet>>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216415_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216416_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -34533,17 +34533,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
assert_eq!(::std::mem::align_of::<::nsstring::nsStringRepr>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
::nsstring::nsStringRepr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217380_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217381_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -34622,28 +34622,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::nsCSSFontFaceRule> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsCSSFontFaceRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsCSSFontFaceRule> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217690_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217691_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217695_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217696_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -34690,17 +34690,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::CSSStyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::CSSStyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::CSSStyleSheet> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218175_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_218176_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::StyleSheet>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::StyleSheet> ) ));
@@ -35360,17 +35360,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr>() , 8usize , concat
! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_221004_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_221005_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut ::std::os::raw::c_void>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut ::std::os::raw::c_void> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut ::std::os::raw::c_void>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut ::std::os::raw::c_void> ) ));
@@ -35428,17 +35428,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::mozilla::DefaultDelete ) ));
assert_eq!(::std::mem::align_of::<root::mozilla::DefaultDelete>() ,
1usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::mozilla::DefaultDelete ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_227269_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_227270_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::AudioContext>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::AudioContext> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::AudioContext>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::AudioContext> ) ));
@@ -35518,17 +35518,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::CycleCollectedJSContext_RunInMetastableStateData>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::CycleCollectedJSContext_RunInMetastableStateData>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229914_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229915_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
@@ -35735,17 +35735,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<f64> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<f64>>() , 8usize ,
concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<f64> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_231302_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_231303_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::dom::Element> ) ));
@@ -35851,17 +35851,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) ));
assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsIAtom>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233678_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233679_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::CounterStyle>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::CounterStyle> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::CounterStyle>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::CounterStyle> ) ));
@@ -36754,17 +36754,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::nsStyleImageRequest> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsStyleImageRequest>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsStyleImageRequest> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_236217_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_236218_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsISupports>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsISupports> ) ));
@@ -36991,28 +36991,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
assert_eq!(::std::mem::align_of::<root::nsCOMPtr>() , 8usize , concat
! (
"Alignment of template specialization: " , stringify ! (
root::nsCOMPtr ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244533_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244534_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244538_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244539_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37090,17 +37090,17 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::ShadowRoot> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::dom::ShadowRoot>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::ShadowRoot> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244651_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244652_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37377,17 +37377,17 @@ pub mod root {
) ));
assert_eq!(::std::mem::align_of::<root::nsAutoPtr<root::mozilla::dom::ExplicitChildIterator>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsAutoPtr<root::mozilla::dom::ExplicitChildIterator>
) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246263_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246264_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37399,28 +37399,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::Element> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::mozilla::dom::Element>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::RefPtr<root::mozilla::dom::Element> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246421_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246422_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246426_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246427_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::nsIContent>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::nsIContent> ) ));
@@ -37553,28 +37553,28 @@ pub mod root {
"Size of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::mozilla::gfx::FontVariation>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<root::mozilla::gfx::FontVariation> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249437_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249438_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
}
#[test]
- fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249443_close0_instantiation() {
+ fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249444_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Size of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
, 8usize , concat ! (
"Alignment of template specialization: " , stringify ! (
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -80,17 +80,17 @@ pub struct ComputedValues(::gecko_bindin
impl ComputedValues {
pub fn new(
device: &Device,
parent: Option<<&ComputedValues>,
pseudo: Option<<&PseudoElement>,
custom_properties: Option<Arc<CustomPropertiesMap>>,
writing_mode: WritingMode,
- font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
flags: ComputedValueFlags,
rules: Option<StrongRuleNode>,
visited_style: Option<Arc<ComputedValues>>,
% for style_struct in data.style_structs:
${style_struct.ident}: Arc<style_structs::${style_struct.name}>,
% endfor
) -> Arc<Self> {
ComputedValuesInner::new(
@@ -183,17 +183,17 @@ impl Clone for ComputedValuesInner {
}
type PseudoInfo = (*mut structs::nsIAtom, structs::CSSPseudoElementType);
type ParentStyleContextInfo<'a> = Option< &'a ComputedValues>;
impl ComputedValuesInner {
pub fn new(custom_properties: Option<Arc<CustomPropertiesMap>>,
writing_mode: WritingMode,
- font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
flags: ComputedValueFlags,
rules: Option<StrongRuleNode>,
visited_style: Option<Arc<ComputedValues>>,
% for style_struct in data.style_structs:
${style_struct.ident}: Arc<style_structs::${style_struct.name}>,
% endfor
) -> Self {
ComputedValuesInner {
--- a/servo/components/style/properties/longhand/font.mako.rs
+++ b/servo/components/style/properties/longhand/font.mako.rs
@@ -950,26 +950,26 @@ macro_rules! impl_gecko_keyword_conversi
}
}
#[allow(unused_mut)]
pub fn cascade_specified_font_size(context: &mut Context,
specified_value: &SpecifiedValue,
mut computed: NonNegativeAu) {
if let SpecifiedValue::Keyword(kw, fraction) = *specified_value {
- context.builder.font_size_keyword = Some((kw, fraction));
+ context.builder.font_size_keyword = Some((kw, fraction, Au(0).into()));
} else if let Some(ratio) = specified_value.as_font_ratio() {
// In case a font-size-relative value was applied to a keyword
// value, we must preserve this fact in case the generic font family
// changes. relative values (em and %) applied to keywords must be
// recomputed from the base size for the keyword and the relative size.
//
// See bug 1355707
- if let Some((kw, fraction)) = context.builder.inherited_font_computation_data().font_size_keyword {
- context.builder.font_size_keyword = Some((kw, fraction * ratio));
+ if let Some((kw, fraction, _)) = context.builder.inherited_font_computation_data().font_size_keyword {
+ context.builder.font_size_keyword = Some((kw, fraction * ratio, Au(0).into()));
} else {
context.builder.font_size_keyword = None;
}
} else {
context.builder.font_size_keyword = None;
}
// we could use clone_language and clone_font_family() here but that's
@@ -977,17 +977,17 @@ macro_rules! impl_gecko_keyword_conversi
% if product == "gecko":
use gecko_bindings::structs::nsIAtom;
// if the language or generic changed, we need to recalculate
// the font size from the stored font-size origin information.
if context.builder.get_font().gecko().mLanguage.raw::<nsIAtom>() !=
context.builder.get_parent_font().gecko().mLanguage.raw::<nsIAtom>() ||
context.builder.get_font().gecko().mGenericID !=
context.builder.get_parent_font().gecko().mGenericID {
- if let Some((kw, ratio)) = context.builder.font_size_keyword {
+ if let Some((kw, ratio, _)) = context.builder.font_size_keyword {
computed = context.maybe_zoom_text(kw.to_computed_value(context).scale_by(ratio));
}
}
% endif
let device = context.builder.device;
let mut font = context.builder.take_font();
let parent_unconstrained = {
@@ -1007,17 +1007,17 @@ macro_rules! impl_gecko_keyword_conversi
}
/// FIXME(emilio): This is very complex. Also, it should move to
/// StyleBuilder.
pub fn cascade_inherit_font_size(context: &mut Context) {
// If inheriting, we must recompute font-size in case of language
// changes using the font_size_keyword. We also need to do this to
// handle mathml scriptlevel changes
- let kw_inherited_size = context.builder.font_size_keyword.map(|(kw, ratio)| {
+ let kw_inherited_size = context.builder.font_size_keyword.map(|(kw, ratio, _)| {
context.maybe_zoom_text(SpecifiedValue::Keyword(kw, ratio).to_computed_value(context))
});
let parent_kw;
let device = context.builder.device;
let mut font = context.builder.take_font();
let used_kw = {
let parent_font = context.builder.get_parent_font();
parent_kw = context.builder.inherited_font_computation_data().font_size_keyword;
@@ -1042,17 +1042,17 @@ macro_rules! impl_gecko_keyword_conversi
longhands::font_size::get_initial_specified_value()
.to_computed_value(context)
);
context.builder.mutate_font().set_font_size(computed);
% if product == "gecko":
let device = context.builder.device;
context.builder.mutate_font().fixup_font_min_size(device);
% endif
- context.builder.font_size_keyword = Some((Default::default(), 1.));
+ context.builder.font_size_keyword = Some((Default::default(), 1., Au(0).into()));
}
</%helpers:longhand>
<%helpers:longhand products="gecko" name="font-size-adjust"
animation_value_type="longhands::font_size_adjust::computed_value::T"
flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER"
spec="https://drafts.csswg.org/css-fonts/#propdef-font-size-adjust">
use properties::longhands::system_font::SystemFont;
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -5,16 +5,17 @@
// This file is a Mako template: http://www.makotemplates.org/
// Please note that valid Rust syntax may be mangled by the Mako parser.
// For example, Vec<&Foo> will be mangled as Vec&Foo>. To work around these issues, the code
// can be escaped. In the above example, Vec<<&Foo> or Vec< &Foo> achieves the desired result of Vec<&Foo>.
<%namespace name="helpers" file="/helpers.mako.rs" />
+use app_units::Au;
#[cfg(feature = "servo")] use app_units::Au;
use servo_arc::{Arc, UniqueArc};
use std::borrow::Cow;
use hash::HashSet;
use std::{fmt, mem, ops};
#[cfg(feature = "gecko")] use std::ptr;
#[cfg(feature = "servo")] use cssparser::RGBA;
@@ -103,32 +104,33 @@ pub struct FontComputationData {
/// or a chain of font-size-relative values applying to successive parents
/// terminated by a keyword. When Some, this means the font-size was derived
/// from a keyword value or a keyword value on some ancestor with only
/// font-size-relative keywords and regular inheritance in between. The
/// integer stores the final ratio of the chain of font size relative values.
/// and is 1 when there was just a keyword and no relative values.
///
/// When this is Some, we compute font sizes by computing the keyword against
- /// the generic font, and then multiplying it by the ratio.
- pub font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>
+ /// the generic font, and then multiplying it by the ratio (as well as adding any
+ /// absolute offset from calcs)
+ pub font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>
}
impl FontComputationData {
/// Assigns values for variables in struct FontComputationData
- pub fn new(font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>) -> Self {
+ pub fn new(font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>) -> Self {
FontComputationData {
font_size_keyword: font_size_keyword
}
}
/// Assigns default values for variables in struct FontComputationData
- pub fn default_font_size_keyword() -> Option<(longhands::font_size::KeywordSize, f32)> {
- Some((Default::default(), 1.))
+ pub fn default_font_size_keyword() -> Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)> {
+ Some((Default::default(), 1., Au(0).into()))
}
/// Gets a FontComputationData with the default values.
pub fn default_values() -> Self {
Self::new(Self::default_font_size_keyword())
}
}
@@ -2000,17 +2002,17 @@ pub struct ComputedValues {
impl ComputedValues {
/// Create a new refcounted `ComputedValues`
pub fn new(
_: &Device,
_: Option<<&ComputedValues>,
_: Option<<&PseudoElement>,
custom_properties: Option<Arc<::custom_properties::CustomPropertiesMap>>,
writing_mode: WritingMode,
- font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
flags: ComputedValueFlags,
rules: Option<StrongRuleNode>,
visited_style: Option<Arc<ComputedValues>>,
% for style_struct in data.active_style_structs():
${style_struct.ident}: Arc<style_structs::${style_struct.name}>,
% endfor
) -> Arc<Self> {
Arc::new(Self {
@@ -2033,17 +2035,17 @@ impl ComputedValues {
}
#[cfg(feature = "servo")]
impl ComputedValuesInner {
/// Construct a `ComputedValuesInner` instance.
pub fn new(
custom_properties: Option<Arc<::custom_properties::CustomPropertiesMap>>,
writing_mode: WritingMode,
- font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
flags: ComputedValueFlags,
rules: Option<StrongRuleNode>,
visited_style: Option<Arc<ComputedValues>>,
% for style_struct in data.active_style_structs():
${style_struct.ident}: Arc<style_structs::${style_struct.name}>,
% endfor
) -> Self {
ComputedValuesInner {
@@ -2557,17 +2559,17 @@ pub struct StyleBuilder<'a> {
/// The pseudo-element this style will represent.
pseudo: Option<<&'a PseudoElement>,
/// The writing mode flags.
///
/// TODO(emilio): Make private.
pub writing_mode: WritingMode,
/// The keyword behind the current font-size property, if any.
- pub font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ pub font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
/// Flags for the computed value.
pub flags: ComputedValueFlags,
/// The element's style if visited, only computed if there's a relevant link
/// for this element. A element's "relevant link" is the element being
/// matched if it is a link or the nearest ancestor link.
visited_style: Option<Arc<ComputedValues>>,
% for style_struct in data.active_style_structs():
${style_struct.ident}: StyleStructRef<'a, style_structs::${style_struct.name}>,
@@ -2580,17 +2582,17 @@ impl<'a> StyleBuilder<'a> {
device: &'a Device,
parent_style: Option<<&'a ComputedValues>,
parent_style_ignoring_first_line: Option<<&'a ComputedValues>,
pseudo: Option<<&'a PseudoElement>,
cascade_flags: CascadeFlags,
rules: Option<StrongRuleNode>,
custom_properties: Option<Arc<::custom_properties::CustomPropertiesMap>>,
writing_mode: WritingMode,
- font_size_keyword: Option<(longhands::font_size::KeywordSize, f32)>,
+ font_size_keyword: Option<(longhands::font_size::KeywordSize, f32, NonNegativeAu)>,
flags: ComputedValueFlags,
visited_style: Option<Arc<ComputedValues>>,
) -> Self {
debug_assert_eq!(parent_style.is_some(), parent_style_ignoring_first_line.is_some());
#[cfg(feature = "gecko")]
debug_assert!(parent_style.is_none() ||
ptr::eq(parent_style.unwrap(),
parent_style_ignoring_first_line.unwrap()) ||