diff --git a/servo/components/style/build_gecko.rs b/servo/components/style/build_gecko.rs index e3708c184592..155b46cf68c8 100644 --- a/servo/components/style/build_gecko.rs +++ b/servo/components/style/build_gecko.rs @@ -377,6 +377,7 @@ mod bindings { "mozilla::DefaultDelete", "mozilla::Side", "mozilla::binding_danger::AssertAndSuppressCleanupPolicy", + "RawServoAnimationValueBorrowedListBorrowed", ]; let opaque_types = [ "std::pair__PCCP", @@ -491,7 +492,6 @@ mod bindings { "RawGeckoNode", "RawGeckoAnimationValueList", "RawServoAnimationValue", - "RawServoAnimationValueList", "RawGeckoPresContext", "RawGeckoPresContextOwned", "ThreadSafeURIHolder", @@ -558,6 +558,8 @@ mod bindings { "nsresult", "Loader", "ServoStyleSheet", + "EffectCompositor_CascadeLevel", + "RawServoAnimationValueBorrowedListBorrowed", ]; struct ArrayType { cpp_type: &'static str, @@ -594,7 +596,6 @@ mod bindings { let servo_borrow_types = [ "nsCSSValue", "RawGeckoAnimationValueList", - "RawServoAnimationValueList", ]; for &ty in structs_types.iter() { builder = builder.hide_type(ty) diff --git a/servo/components/style/gecko_bindings/bindings.rs b/servo/components/style/gecko_bindings/bindings.rs index 2c13323bd831..f630b17977b6 100644 --- a/servo/components/style/gecko_bindings/bindings.rs +++ b/servo/components/style/gecko_bindings/bindings.rs @@ -3,13 +3,11 @@ pub use nsstring::{nsACString, nsAString}; type nsACString_internal = nsACString; type nsAString_internal = nsAString; -use gecko_bindings::structs::EffectCompositor_CascadeLevel; use gecko_bindings::structs::RawGeckoDocument; use gecko_bindings::structs::RawGeckoElement; use gecko_bindings::structs::RawGeckoNode; use gecko_bindings::structs::RawGeckoAnimationValueList; use gecko_bindings::structs::RawServoAnimationValue; -use gecko_bindings::structs::RawServoAnimationValueBorrowedList; use gecko_bindings::structs::RawGeckoPresContext; use gecko_bindings::structs::RawGeckoPresContextOwned; use gecko_bindings::structs::ThreadSafeURIHolder; @@ -152,6 +150,8 @@ use gecko_bindings::structs::nscoord; use gecko_bindings::structs::nsresult; use gecko_bindings::structs::Loader; use gecko_bindings::structs::ServoStyleSheet; +use gecko_bindings::structs::EffectCompositor_CascadeLevel; +use gecko_bindings::structs::RawServoAnimationValueBorrowedListBorrowed; pub type nsTArrayBorrowed_uintptr_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray; pub type ServoComputedValuesStrong = ::gecko_bindings::sugar::ownership::Strong; pub type ServoComputedValuesBorrowed<'a> = &'a ServoComputedValues; @@ -226,8 +226,6 @@ pub type RawGeckoAnimationValueListBorrowed<'a> = &'a RawGeckoAnimationValueList pub type RawGeckoAnimationValueListBorrowedOrNull<'a> = Option<&'a RawGeckoAnimationValueList>; pub type RawGeckoAnimationValueListBorrowedMut<'a> = &'a mut RawGeckoAnimationValueList; pub type RawGeckoAnimationValueListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoAnimationValueList>; -pub type RawServoAnimationValueBorrowedListBorrowed<'a> = &'a RawServoAnimationValueBorrowedList; -pub type RawServoAnimationValueBorrowedListBorrowedOrNull<'a> = Option<&'a RawServoAnimationValueBorrowedList>; extern "C" { pub fn Gecko_EnsureTArrayCapacity(aArray: *mut ::std::os::raw::c_void, @@ -503,9 +501,10 @@ extern "C" { -> RawServoDeclarationBlockStrongBorrowedOrNull; } extern "C" { - pub fn Gecko_GetAnimationRule(element: RawGeckoElementBorrowed, - aAtom: *mut nsIAtom, - aCascadeLevel: EffectCompositor_CascadeLevel) + pub fn Gecko_GetAnimationRule(aElement: RawGeckoElementBorrowed, + aPseudoTag: *mut nsIAtom, + aCascadeLevel: + EffectCompositor_CascadeLevel) -> RawServoDeclarationBlockStrong; } extern "C" { @@ -1227,16 +1226,6 @@ extern "C" { ServoComputedValuesBorrowed) -> ServoComputedValuesStrong; } -extern "C" { - pub fn Servo_AnimationValues_Interpolate(from: RawServoAnimationValueBorrowed, - to: RawServoAnimationValueBorrowed, - progress: f64) - -> RawServoAnimationValueStrong; -} -extern "C" { - pub fn Servo_AnimationValues_Uncompute(value: RawServoAnimationValueBorrowedListBorrowed) - -> RawServoDeclarationBlockStrong; -} extern "C" { pub fn Servo_AnimationValues_Populate(arg1: RawGeckoAnimationValueListBorrowedMut, @@ -1247,6 +1236,19 @@ extern "C" { ServoComputedValuesBorrowedOrNull, arg5: RawGeckoPresContextBorrowed); } +extern "C" { + pub fn Servo_AnimationValues_Interpolate(from: + RawServoAnimationValueBorrowed, + to: + RawServoAnimationValueBorrowed, + progress: f64) + -> RawServoAnimationValueStrong; +} +extern "C" { + pub fn Servo_AnimationValues_Uncompute(value: + RawServoAnimationValueBorrowedListBorrowed) + -> RawServoDeclarationBlockStrong; +} extern "C" { pub fn Servo_ParseStyleAttribute(data: *const nsACString_internal) -> RawServoDeclarationBlockStrong; diff --git a/servo/components/style/gecko_bindings/structs_debug.rs b/servo/components/style/gecko_bindings/structs_debug.rs index 7b5df8fb80bf..7b9a39f8547e 100644 --- a/servo/components/style/gecko_bindings/structs_debug.rs +++ b/servo/components/style/gecko_bindings/structs_debug.rs @@ -994,7 +994,6 @@ pub mod root { pub const NS_STYLE_DISPLAY_MODE_BROWSER: ::std::os::raw::c_uint = 0; pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI: ::std::os::raw::c_uint = 1; pub const NS_STYLE_DISPLAY_MODE_STANDALONE: ::std::os::raw::c_uint = 2; - pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN: ::std::os::raw::c_uint = 3; pub const NS_STYLE_INHERIT_MASK: ::std::os::raw::c_uint = 16777215; pub const NS_STYLE_HAS_TEXT_DECORATION_LINES: ::std::os::raw::c_uint = 16777216; @@ -1490,6 +1489,11 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct ReverseIterator { + pub mCurrent: IteratorT, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct AlignedStorage2 { pub u: root::mozilla::AlignedStorage2_U, pub _phantom_0: ::std::marker::PhantomData, @@ -3667,6 +3671,14 @@ pub mod root { } } #[repr(C)] + #[derive(Debug, Copy)] + pub struct AbstractThread { + pub _address: u8, + } + impl Clone for AbstractThread { + fn clone(&self) -> Self { *self } + } + #[repr(C)] #[derive(Debug)] pub struct OriginAttributes { pub _base: root::mozilla::dom::OriginAttributesDictionary, @@ -4178,10 +4190,12 @@ pub mod root { pub _base_1: root::nsWrapperCache, pub mRefCnt: root::nsCycleCollectingAutoRefCnt, pub _mOwningThread: root::nsAutoOwningThread, + pub mParent: *mut root::mozilla::StyleSheet, pub mTitle: ::nsstring::nsStringRepr, pub mDocument: *mut root::nsIDocument, pub mOwningNode: *mut root::nsINode, pub mMedia: root::RefPtr, + pub mNext: root::RefPtr, pub mParsingMode: root::mozilla::css::SheetParsingMode, pub mType: root::mozilla::StyleBackendType, pub mDisabled: bool, @@ -4216,7 +4230,7 @@ pub mod root { } #[test] fn bindgen_test_layout_StyleSheet() { - assert_eq!(::std::mem::size_of::() , 104usize); + assert_eq!(::std::mem::size_of::() , 120usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(u8)] @@ -4461,6 +4475,20 @@ pub mod root { fn clone(&self) -> Self { *self } } /** + * Additional data used in conjunction with an nsRestyleHint to control the + * restyle process. + */ + #[repr(C)] + #[derive(Debug)] + pub struct RestyleHintData { + pub mSelectorsForDescendants: root::nsTArray<*mut root::nsCSSSelector>, + } + #[test] + fn bindgen_test_layout_RestyleHintData() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } + /** * A structure representing a single attribute name and value. * * This is pretty similar to the private nsAttrAndChildArray::InternalAttr. @@ -5174,13 +5202,74 @@ pub mod root { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] - #[derive(Debug, Copy)] + #[derive(Debug)] pub struct EffectCompositor { - pub _address: u8, + pub mRefCnt: root::nsCycleCollectingAutoRefCnt, + pub _mOwningThread: root::nsAutoOwningThread, + pub mPresContext: *mut root::nsPresContext, + pub mElementsToRestyle: [u64; 12usize], + pub mRuleProcessors: [u64; 4usize], } - impl Clone for EffectCompositor { + pub type EffectCompositor_HasThreadSafeRefCnt = + root::mozilla::FalseType; + #[repr(C)] + #[derive(Debug, Copy)] + pub struct EffectCompositor_cycleCollection { + pub _base: root::nsCycleCollectionParticipant, + } + #[test] + fn bindgen_test_layout_EffectCompositor_cycleCollection() { + assert_eq!(::std::mem::size_of::() + , 16usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + impl Clone for EffectCompositor_cycleCollection { fn clone(&self) -> Self { *self } } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum EffectCompositor_CascadeLevel { + Animations = 0, + Transitions = 1, + } + #[repr(i32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum EffectCompositor_RestyleType { + Throttled = 0, + Standard = 1, + Layer = 2, + } + #[repr(C)] + #[derive(Debug)] + pub struct EffectCompositor_AnimationStyleRuleProcessor { + pub _base: root::nsIStyleRuleProcessor, + pub mRefCnt: root::nsAutoRefCnt, + pub _mOwningThread: root::nsAutoOwningThread, + pub mCompositor: *mut root::mozilla::EffectCompositor, + pub mCascadeLevel: root::mozilla::EffectCompositor_CascadeLevel, + } + pub type EffectCompositor_AnimationStyleRuleProcessor_HasThreadSafeRefCnt + = root::mozilla::FalseType; + #[test] + fn bindgen_test_layout_EffectCompositor_AnimationStyleRuleProcessor() { + assert_eq!(::std::mem::size_of::() + , 40usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + extern "C" { + #[link_name = + "_ZN7mozilla16EffectCompositor21_cycleCollectorGlobalE"] + pub static mut EffectCompositor__cycleCollectorGlobal: + root::mozilla::EffectCompositor_cycleCollection; + } + pub const EffectCompositor_kCascadeLevelCount: usize = 2; + #[test] + fn bindgen_test_layout_EffectCompositor() { + assert_eq!(::std::mem::size_of::() , 152usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } #[repr(C)] #[derive(Debug, Copy)] pub struct EventStateManager { @@ -5273,12 +5362,6 @@ pub mod root { impl Clone for StyleComplexColor { fn clone(&self) -> Self { *self } } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum EffectCompositor_CascadeLevel { - Animations = 0, - Transitions = 1, - } #[repr(C)] #[derive(Debug)] pub struct PropertyStyleAnimationValuePair { @@ -5300,6 +5383,136 @@ pub mod root { assert_eq!(::std::mem::align_of::>() , 1usize); } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct RestyleTracker { + pub _address: u8, + } + impl Clone for RestyleTracker { + fn clone(&self) -> Self { *self } + } + /** + * Utility class to handle animated style values + */ + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StyleAnimationValue { + pub _bindgen_opaque_blob: [u64; 2usize], + } + #[repr(u32)] + /** + * The types and values for the values that we extract and animate. + */ + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_Unit { + eUnit_Null = 0, + eUnit_Normal = 1, + eUnit_Auto = 2, + eUnit_None = 3, + eUnit_Enumerated = 4, + eUnit_Visibility = 5, + eUnit_Integer = 6, + eUnit_Coord = 7, + eUnit_Percent = 8, + eUnit_Float = 9, + eUnit_Color = 10, + eUnit_CurrentColor = 11, + eUnit_ComplexColor = 12, + eUnit_Calc = 13, + eUnit_ObjectPosition = 14, + eUnit_URL = 15, + eUnit_DiscreteCSSValue = 16, + eUnit_CSSValuePair = 17, + eUnit_CSSValueTriplet = 18, + eUnit_CSSRect = 19, + eUnit_Dasharray = 20, + eUnit_Shadow = 21, + eUnit_Shape = 22, + eUnit_Filter = 23, + eUnit_Transform = 24, + eUnit_BackgroundPositionCoord = 25, + eUnit_CSSValuePairList = 26, + eUnit_UnparsedString = 27, + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StyleAnimationValue__bindgen_ty_1 { + pub mInt: root::__BindgenUnionField, + pub mCoord: root::__BindgenUnionField, + pub mFloat: root::__BindgenUnionField, + pub mCSSValue: root::__BindgenUnionField<*mut root::nsCSSValue>, + pub mCSSValuePair: root::__BindgenUnionField<*mut root::nsCSSValuePair>, + pub mCSSValueTriplet: root::__BindgenUnionField<*mut root::nsCSSValueTriplet>, + pub mCSSRect: root::__BindgenUnionField<*mut root::nsCSSRect>, + pub mCSSValueArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>, + pub mCSSValueList: root::__BindgenUnionField<*mut root::nsCSSValueList>, + pub mCSSValueSharedList: root::__BindgenUnionField<*mut root::nsCSSValueSharedList>, + pub mCSSValuePairList: root::__BindgenUnionField<*mut root::nsCSSValuePairList>, + pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>, + pub mComplexColor: root::__BindgenUnionField<*mut root::mozilla::css::ComplexColorValue>, + pub bindgen_union_field: u64, + } + #[test] + fn bindgen_test_layout_StyleAnimationValue__bindgen_ty_1() { + assert_eq!(::std::mem::size_of::() + , 8usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + impl Clone for StyleAnimationValue__bindgen_ty_1 { + fn clone(&self) -> Self { *self } + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_IntegerConstructorType { + IntegerConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_CoordConstructorType { + CoordConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_PercentConstructorType { + PercentConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_FloatConstructorType { + FloatConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_ColorConstructorType { + ColorConstructor = 0, + } + #[test] + fn bindgen_test_layout_StyleAnimationValue() { + assert_eq!(::std::mem::size_of::() , + 16usize); + assert_eq!(::std::mem::align_of::() , + 8usize); + } + impl Clone for StyleAnimationValue { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct ServoAnimationRule { + pub _address: u8, + } + impl Clone for ServoAnimationRule { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AnimationPerformanceWarning { + pub _address: u8, + } + impl Clone for AnimationPerformanceWarning { + fn clone(&self) -> Self { *self } + } pub type CSSPseudoClassTypeBase = u8; #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -5624,112 +5837,6 @@ pub mod root { root::mozilla::StyleShapeSource; pub type StyleShapeOutside = root::mozilla::StyleShapeSource; - /** - * Utility class to handle animated style values - */ - #[repr(C)] - #[derive(Debug, Copy)] - pub struct StyleAnimationValue { - pub _bindgen_opaque_blob: [u64; 2usize], - } - #[repr(u32)] - /** - * The types and values for the values that we extract and animate. - */ - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_Unit { - eUnit_Null = 0, - eUnit_Normal = 1, - eUnit_Auto = 2, - eUnit_None = 3, - eUnit_Enumerated = 4, - eUnit_Visibility = 5, - eUnit_Integer = 6, - eUnit_Coord = 7, - eUnit_Percent = 8, - eUnit_Float = 9, - eUnit_Color = 10, - eUnit_CurrentColor = 11, - eUnit_ComplexColor = 12, - eUnit_Calc = 13, - eUnit_ObjectPosition = 14, - eUnit_URL = 15, - eUnit_DiscreteCSSValue = 16, - eUnit_CSSValuePair = 17, - eUnit_CSSValueTriplet = 18, - eUnit_CSSRect = 19, - eUnit_Dasharray = 20, - eUnit_Shadow = 21, - eUnit_Shape = 22, - eUnit_Filter = 23, - eUnit_Transform = 24, - eUnit_BackgroundPositionCoord = 25, - eUnit_CSSValuePairList = 26, - eUnit_UnparsedString = 27, - } - #[repr(C)] - #[derive(Debug, Copy)] - pub struct StyleAnimationValue__bindgen_ty_1 { - pub mInt: root::__BindgenUnionField, - pub mCoord: root::__BindgenUnionField, - pub mFloat: root::__BindgenUnionField, - pub mCSSValue: root::__BindgenUnionField<*mut root::nsCSSValue>, - pub mCSSValuePair: root::__BindgenUnionField<*mut root::nsCSSValuePair>, - pub mCSSValueTriplet: root::__BindgenUnionField<*mut root::nsCSSValueTriplet>, - pub mCSSRect: root::__BindgenUnionField<*mut root::nsCSSRect>, - pub mCSSValueArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>, - pub mCSSValueList: root::__BindgenUnionField<*mut root::nsCSSValueList>, - pub mCSSValueSharedList: root::__BindgenUnionField<*mut root::nsCSSValueSharedList>, - pub mCSSValuePairList: root::__BindgenUnionField<*mut root::nsCSSValuePairList>, - pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>, - pub mComplexColor: root::__BindgenUnionField<*mut root::mozilla::css::ComplexColorValue>, - pub bindgen_union_field: u64, - } - #[test] - fn bindgen_test_layout_StyleAnimationValue__bindgen_ty_1() { - assert_eq!(::std::mem::size_of::() - , 8usize); - assert_eq!(::std::mem::align_of::() - , 8usize); - } - impl Clone for StyleAnimationValue__bindgen_ty_1 { - fn clone(&self) -> Self { *self } - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_IntegerConstructorType { - IntegerConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_CoordConstructorType { - CoordConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_PercentConstructorType { - PercentConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_FloatConstructorType { - FloatConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_ColorConstructorType { - ColorConstructor = 0, - } - #[test] - fn bindgen_test_layout_StyleAnimationValue() { - assert_eq!(::std::mem::size_of::() , - 16usize); - assert_eq!(::std::mem::align_of::() , - 8usize); - } - impl Clone for StyleAnimationValue { - fn clone(&self) -> Self { *self } - } #[test] fn __bindgen_test_layout_template_2() { assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize); @@ -5833,7 +5940,6 @@ pub mod root { } pub type pair_first_type<_T1> = _T1; pub type pair_second_type<_T2> = _T2; - pub type pair__PCCP = [u8; 0usize]; #[repr(C)] #[derive(Debug)] pub struct atomic<_Tp> { @@ -7449,12 +7555,12 @@ pub mod root { ** A type for representing the size of objects. ************************************************************************/ pub type PRSize = usize; - pub const PR_FAILURE: root::_bindgen_ty_115 = _bindgen_ty_115::PR_FAILURE; - pub const PR_SUCCESS: root::_bindgen_ty_115 = _bindgen_ty_115::PR_SUCCESS; + pub const PR_FAILURE: root::_bindgen_ty_144 = _bindgen_ty_144::PR_FAILURE; + pub const PR_SUCCESS: root::_bindgen_ty_144 = _bindgen_ty_144::PR_SUCCESS; #[repr(i32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_115 { PR_FAILURE = -1, PR_SUCCESS = 0, } - pub use self::super::root::_bindgen_ty_115 as PRStatus; + pub enum _bindgen_ty_144 { PR_FAILURE = -1, PR_SUCCESS = 0, } + pub use self::super::root::_bindgen_ty_144 as PRStatus; pub type PRUword = ::std::os::raw::c_ulong; pub type PRTime = root::PRInt64; #[repr(C)] @@ -12517,63 +12623,63 @@ pub mod root { impl Clone for nsDOMMutationObserver { fn clone(&self) -> Self { *self } } - pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_LISTENERMANAGER; - pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_PROPERTIES; - pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_ANONYMOUS_ROOT; - pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; - pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_NATIVE_ANONYMOUS_ROOT; - pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_FORCE_XBL_BINDINGS; - pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_MAY_BE_IN_BINDING_MNGR; - pub const NODE_IS_EDITABLE: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_EDITABLE; - pub const NODE_MAY_HAVE_CLASS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_MAY_HAVE_CLASS; - pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_IN_SHADOW_TREE; - pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_EMPTY_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_SLOW_SELECTOR; - pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_EDGE_CHILD_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; - pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_ALL_SELECTOR_FLAGS; - pub const NODE_NEEDS_FRAME: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_NEEDS_FRAME; - pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_DESCENDANTS_NEED_FRAMES; - pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_ACCESSKEY; - pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_DIRECTION_RTL; - pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_HAS_DIRECTION_LTR; - pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_ALL_DIRECTION_FLAGS; - pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_CHROME_ONLY_ACCESS; - pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; - pub const NODE_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_SHARED_RESTYLE_BIT_1; - pub const NODE_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_SHARED_RESTYLE_BIT_2; - pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_SHARED_RESTYLE_BIT_1; - pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_137 = - _bindgen_ty_137::NODE_TYPE_SPECIFIC_BITS_OFFSET; + pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_LISTENERMANAGER; + pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_PROPERTIES; + pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_ANONYMOUS_ROOT; + pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; + pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_NATIVE_ANONYMOUS_ROOT; + pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_FORCE_XBL_BINDINGS; + pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_MAY_BE_IN_BINDING_MNGR; + pub const NODE_IS_EDITABLE: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_EDITABLE; + pub const NODE_MAY_HAVE_CLASS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_MAY_HAVE_CLASS; + pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_IN_SHADOW_TREE; + pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_EMPTY_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_SLOW_SELECTOR; + pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_EDGE_CHILD_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; + pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_ALL_SELECTOR_FLAGS; + pub const NODE_NEEDS_FRAME: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_NEEDS_FRAME; + pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_DESCENDANTS_NEED_FRAMES; + pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_ACCESSKEY; + pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_DIRECTION_RTL; + pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_HAS_DIRECTION_LTR; + pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_ALL_DIRECTION_FLAGS; + pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_CHROME_ONLY_ACCESS; + pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; + pub const NODE_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_SHARED_RESTYLE_BIT_1; + pub const NODE_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_SHARED_RESTYLE_BIT_2; + pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_SHARED_RESTYLE_BIT_1; + pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_155 = + _bindgen_ty_155::NODE_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_137 { + pub enum _bindgen_ty_155 { NODE_HAS_LISTENERMANAGER = 4, NODE_HAS_PROPERTIES = 8, NODE_IS_ANONYMOUS_ROOT = 16, @@ -12739,6 +12845,7 @@ pub mod root { * via the "TimerFirings" log module. * * @param aTimer the timer which has expired + * @param aAnonymize whether the name should avoid including privacy sensitive info * @param aClosure opaque parameter passed to initWithFuncCallback * @param aBuf a buffer in which to put the name * @param aLen the length of the buffer @@ -12746,6 +12853,7 @@ pub mod root { pub type nsTimerNameCallbackFunc = ::std::option::Option; + pub type RawServoAnimationValueBorrowedList = + root::nsTArray<*const root::RawServoAnimationValue>; pub type RawGeckoNodeBorrowed = *const root::RawGeckoNode; pub type RawGeckoNodeBorrowedOrNull = *const root::RawGeckoNode; pub type RawGeckoElementBorrowed = *const root::RawGeckoElement; @@ -17959,10 +18069,98 @@ pub mod root { pub type RawGeckoPresContextBorrowedMut = *mut root::RawGeckoPresContext; pub type RawGeckoAnimationValueListBorrowedMut = *mut root::RawGeckoAnimationValueList; - pub type RawServoAnimationValueBorrowedList = - root::nsTArray<*const root::RawServoAnimationValue>; pub type RawServoAnimationValueBorrowedListBorrowed = *const root::RawServoAnimationValueBorrowedList; + #[repr(C)] + #[derive(Debug, Copy)] + pub struct ElementRuleProcessorData { + pub _address: u8, + } + impl Clone for ElementRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct PseudoElementRuleProcessorData { + pub _address: u8, + } + impl Clone for PseudoElementRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AnonBoxRuleProcessorData { + pub _address: u8, + } + impl Clone for AnonBoxRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct XULTreeRuleProcessorData { + pub _address: u8, + } + impl Clone for XULTreeRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StateRuleProcessorData { + pub _address: u8, + } + impl Clone for StateRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct PseudoElementStateRuleProcessorData { + pub _address: u8, + } + impl Clone for PseudoElementStateRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AttributeRuleProcessorData { + pub _address: u8, + } + impl Clone for AttributeRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsIStyleRuleProcessor { + pub _base: root::nsISupports, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct nsIStyleRuleProcessor_COMTypeInfo { + pub _address: u8, + pub _phantom_0: ::std::marker::PhantomData, + pub _phantom_1: ::std::marker::PhantomData, + } + pub type nsIStyleRuleProcessor_EnumFunc = + ::std::option::Option bool>; + #[test] + fn bindgen_test_layout_nsIStyleRuleProcessor() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } + impl Clone for nsIStyleRuleProcessor { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsIStyleRule { + pub _address: u8, + } + impl Clone for nsIStyleRule { + fn clone(&self) -> Self { *self } + } #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum nsCSSTokenSerializationType { @@ -19945,232 +20143,251 @@ pub mod root { } #[test] fn __bindgen_test_layout_template_41() { + assert_eq!(::std::mem::size_of::>() + , 8usize); + assert_eq!(::std::mem::align_of::>() + , 8usize); + } + #[test] + fn __bindgen_test_layout_template_42() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_42() { + fn __bindgen_test_layout_template_43() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_43() { + fn __bindgen_test_layout_template_44() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_44() { + fn __bindgen_test_layout_template_45() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_45() { + fn __bindgen_test_layout_template_46() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_46() { + fn __bindgen_test_layout_template_47() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_47() { + fn __bindgen_test_layout_template_48() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_48() { + fn __bindgen_test_layout_template_49() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_49() { + fn __bindgen_test_layout_template_50() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_50() { + fn __bindgen_test_layout_template_51() { assert_eq!(::std::mem::size_of::<[u64; 29usize]>() , 232usize); assert_eq!(::std::mem::align_of::<[u64; 29usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_51() { + fn __bindgen_test_layout_template_52() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_52() { + fn __bindgen_test_layout_template_53() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_53() { + fn __bindgen_test_layout_template_54() { assert_eq!(::std::mem::size_of::<[u64; 6usize]>() , 48usize); assert_eq!(::std::mem::align_of::<[u64; 6usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_54() { + fn __bindgen_test_layout_template_55() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_55() { + fn __bindgen_test_layout_template_56() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_56() { + fn __bindgen_test_layout_template_57() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_57() { + fn __bindgen_test_layout_template_58() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_58() { + fn __bindgen_test_layout_template_59() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_59() { + fn __bindgen_test_layout_template_60() { assert_eq!(::std::mem::size_of::>() , 16usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_60() { + fn __bindgen_test_layout_template_61() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_61() { + fn __bindgen_test_layout_template_62() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_62() { + fn __bindgen_test_layout_template_63() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_63() { + fn __bindgen_test_layout_template_64() { assert_eq!(::std::mem::size_of::>() , 24usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_64() { + fn __bindgen_test_layout_template_65() { assert_eq!(::std::mem::size_of::>() , 24usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_65() { + fn __bindgen_test_layout_template_66() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_66() { + fn __bindgen_test_layout_template_67() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_67() { + fn __bindgen_test_layout_template_68() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_68() { + fn __bindgen_test_layout_template_69() { assert_eq!(::std::mem::size_of::>() , 16usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_69() { + fn __bindgen_test_layout_template_70() { + assert_eq!(::std::mem::size_of::<[u64; 6usize]>() , 48usize); + assert_eq!(::std::mem::align_of::<[u64; 6usize]>() , 8usize); + } + #[test] + fn __bindgen_test_layout_template_71() { + assert_eq!(::std::mem::size_of::>() + , 16usize); + assert_eq!(::std::mem::align_of::>() + , 8usize); + } + #[test] + fn __bindgen_test_layout_template_72() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_70() { + fn __bindgen_test_layout_template_73() { assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize); assert_eq!(::std::mem::align_of::<[u64; 2usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_71() { + fn __bindgen_test_layout_template_74() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_72() { + fn __bindgen_test_layout_template_75() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_73() { + fn __bindgen_test_layout_template_76() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_74() { + fn __bindgen_test_layout_template_77() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_75() { + fn __bindgen_test_layout_template_78() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -20179,14 +20396,14 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_76() { + fn __bindgen_test_layout_template_79() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_77() { + fn __bindgen_test_layout_template_80() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -20195,31 +20412,31 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_78() { + fn __bindgen_test_layout_template_81() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_79() { + fn __bindgen_test_layout_template_82() { assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize); assert_eq!(::std::mem::align_of::<[u64; 2usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_80() { + fn __bindgen_test_layout_template_83() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_81() { + fn __bindgen_test_layout_template_84() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_82() { + fn __bindgen_test_layout_template_85() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -20228,21 +20445,21 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_83() { + fn __bindgen_test_layout_template_86() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_84() { + fn __bindgen_test_layout_template_87() { assert_eq!(::std::mem::size_of::>() , 32usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_85() { + fn __bindgen_test_layout_template_88() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() diff --git a/servo/components/style/gecko_bindings/structs_release.rs b/servo/components/style/gecko_bindings/structs_release.rs index 6a0d4927d07a..9dcdab57522a 100644 --- a/servo/components/style/gecko_bindings/structs_release.rs +++ b/servo/components/style/gecko_bindings/structs_release.rs @@ -994,7 +994,6 @@ pub mod root { pub const NS_STYLE_DISPLAY_MODE_BROWSER: ::std::os::raw::c_uint = 0; pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI: ::std::os::raw::c_uint = 1; pub const NS_STYLE_DISPLAY_MODE_STANDALONE: ::std::os::raw::c_uint = 2; - pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN: ::std::os::raw::c_uint = 3; pub const NS_STYLE_INHERIT_MASK: ::std::os::raw::c_uint = 16777215; pub const NS_STYLE_HAS_TEXT_DECORATION_LINES: ::std::os::raw::c_uint = 16777216; @@ -1489,6 +1488,11 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct ReverseIterator { + pub mCurrent: IteratorT, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct AlignedStorage2 { pub u: root::mozilla::AlignedStorage2_U, pub _phantom_0: ::std::marker::PhantomData, @@ -3642,6 +3646,14 @@ pub mod root { } } #[repr(C)] + #[derive(Debug, Copy)] + pub struct AbstractThread { + pub _address: u8, + } + impl Clone for AbstractThread { + fn clone(&self) -> Self { *self } + } + #[repr(C)] #[derive(Debug)] pub struct OriginAttributes { pub _base: root::mozilla::dom::OriginAttributesDictionary, @@ -4097,10 +4109,12 @@ pub mod root { pub _base: root::nsIDOMCSSStyleSheet, pub _base_1: root::nsWrapperCache, pub mRefCnt: root::nsCycleCollectingAutoRefCnt, + pub mParent: *mut root::mozilla::StyleSheet, pub mTitle: ::nsstring::nsStringRepr, pub mDocument: *mut root::nsIDocument, pub mOwningNode: *mut root::nsINode, pub mMedia: root::RefPtr, + pub mNext: root::RefPtr, pub mParsingMode: root::mozilla::css::SheetParsingMode, pub mType: root::mozilla::StyleBackendType, pub mDisabled: bool, @@ -4135,7 +4149,7 @@ pub mod root { } #[test] fn bindgen_test_layout_StyleSheet() { - assert_eq!(::std::mem::size_of::() , 96usize); + assert_eq!(::std::mem::size_of::() , 112usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(u8)] @@ -4380,6 +4394,20 @@ pub mod root { fn clone(&self) -> Self { *self } } /** + * Additional data used in conjunction with an nsRestyleHint to control the + * restyle process. + */ + #[repr(C)] + #[derive(Debug)] + pub struct RestyleHintData { + pub mSelectorsForDescendants: root::nsTArray<*mut root::nsCSSSelector>, + } + #[test] + fn bindgen_test_layout_RestyleHintData() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } + /** * A structure representing a single attribute name and value. * * This is pretty similar to the private nsAttrAndChildArray::InternalAttr. @@ -5093,13 +5121,72 @@ pub mod root { assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] - #[derive(Debug, Copy)] + #[derive(Debug)] pub struct EffectCompositor { - pub _address: u8, + pub mRefCnt: root::nsCycleCollectingAutoRefCnt, + pub mPresContext: *mut root::nsPresContext, + pub mElementsToRestyle: [u64; 10usize], + pub mRuleProcessors: [u64; 2usize], } - impl Clone for EffectCompositor { + pub type EffectCompositor_HasThreadSafeRefCnt = + root::mozilla::FalseType; + #[repr(C)] + #[derive(Debug, Copy)] + pub struct EffectCompositor_cycleCollection { + pub _base: root::nsCycleCollectionParticipant, + } + #[test] + fn bindgen_test_layout_EffectCompositor_cycleCollection() { + assert_eq!(::std::mem::size_of::() + , 16usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + impl Clone for EffectCompositor_cycleCollection { fn clone(&self) -> Self { *self } } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum EffectCompositor_CascadeLevel { + Animations = 0, + Transitions = 1, + } + #[repr(i32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum EffectCompositor_RestyleType { + Throttled = 0, + Standard = 1, + Layer = 2, + } + #[repr(C)] + #[derive(Debug)] + pub struct EffectCompositor_AnimationStyleRuleProcessor { + pub _base: root::nsIStyleRuleProcessor, + pub mRefCnt: root::nsAutoRefCnt, + pub mCompositor: *mut root::mozilla::EffectCompositor, + pub mCascadeLevel: root::mozilla::EffectCompositor_CascadeLevel, + } + pub type EffectCompositor_AnimationStyleRuleProcessor_HasThreadSafeRefCnt + = root::mozilla::FalseType; + #[test] + fn bindgen_test_layout_EffectCompositor_AnimationStyleRuleProcessor() { + assert_eq!(::std::mem::size_of::() + , 32usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + extern "C" { + #[link_name = + "_ZN7mozilla16EffectCompositor21_cycleCollectorGlobalE"] + pub static mut EffectCompositor__cycleCollectorGlobal: + root::mozilla::EffectCompositor_cycleCollection; + } + pub const EffectCompositor_kCascadeLevelCount: usize = 2; + #[test] + fn bindgen_test_layout_EffectCompositor() { + assert_eq!(::std::mem::size_of::() , 112usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } #[repr(C)] #[derive(Debug, Copy)] pub struct EventStateManager { @@ -5191,12 +5278,6 @@ pub mod root { impl Clone for StyleComplexColor { fn clone(&self) -> Self { *self } } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum EffectCompositor_CascadeLevel { - Animations = 0, - Transitions = 1, - } #[repr(C)] #[derive(Debug)] pub struct PropertyStyleAnimationValuePair { @@ -5218,6 +5299,136 @@ pub mod root { assert_eq!(::std::mem::align_of::>() , 1usize); } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct RestyleTracker { + pub _address: u8, + } + impl Clone for RestyleTracker { + fn clone(&self) -> Self { *self } + } + /** + * Utility class to handle animated style values + */ + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StyleAnimationValue { + pub _bindgen_opaque_blob: [u64; 2usize], + } + #[repr(u32)] + /** + * The types and values for the values that we extract and animate. + */ + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_Unit { + eUnit_Null = 0, + eUnit_Normal = 1, + eUnit_Auto = 2, + eUnit_None = 3, + eUnit_Enumerated = 4, + eUnit_Visibility = 5, + eUnit_Integer = 6, + eUnit_Coord = 7, + eUnit_Percent = 8, + eUnit_Float = 9, + eUnit_Color = 10, + eUnit_CurrentColor = 11, + eUnit_ComplexColor = 12, + eUnit_Calc = 13, + eUnit_ObjectPosition = 14, + eUnit_URL = 15, + eUnit_DiscreteCSSValue = 16, + eUnit_CSSValuePair = 17, + eUnit_CSSValueTriplet = 18, + eUnit_CSSRect = 19, + eUnit_Dasharray = 20, + eUnit_Shadow = 21, + eUnit_Shape = 22, + eUnit_Filter = 23, + eUnit_Transform = 24, + eUnit_BackgroundPositionCoord = 25, + eUnit_CSSValuePairList = 26, + eUnit_UnparsedString = 27, + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StyleAnimationValue__bindgen_ty_1 { + pub mInt: root::__BindgenUnionField, + pub mCoord: root::__BindgenUnionField, + pub mFloat: root::__BindgenUnionField, + pub mCSSValue: root::__BindgenUnionField<*mut root::nsCSSValue>, + pub mCSSValuePair: root::__BindgenUnionField<*mut root::nsCSSValuePair>, + pub mCSSValueTriplet: root::__BindgenUnionField<*mut root::nsCSSValueTriplet>, + pub mCSSRect: root::__BindgenUnionField<*mut root::nsCSSRect>, + pub mCSSValueArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>, + pub mCSSValueList: root::__BindgenUnionField<*mut root::nsCSSValueList>, + pub mCSSValueSharedList: root::__BindgenUnionField<*mut root::nsCSSValueSharedList>, + pub mCSSValuePairList: root::__BindgenUnionField<*mut root::nsCSSValuePairList>, + pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>, + pub mComplexColor: root::__BindgenUnionField<*mut root::mozilla::css::ComplexColorValue>, + pub bindgen_union_field: u64, + } + #[test] + fn bindgen_test_layout_StyleAnimationValue__bindgen_ty_1() { + assert_eq!(::std::mem::size_of::() + , 8usize); + assert_eq!(::std::mem::align_of::() + , 8usize); + } + impl Clone for StyleAnimationValue__bindgen_ty_1 { + fn clone(&self) -> Self { *self } + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_IntegerConstructorType { + IntegerConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_CoordConstructorType { + CoordConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_PercentConstructorType { + PercentConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_FloatConstructorType { + FloatConstructor = 0, + } + #[repr(u32)] + #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub enum StyleAnimationValue_ColorConstructorType { + ColorConstructor = 0, + } + #[test] + fn bindgen_test_layout_StyleAnimationValue() { + assert_eq!(::std::mem::size_of::() , + 16usize); + assert_eq!(::std::mem::align_of::() , + 8usize); + } + impl Clone for StyleAnimationValue { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct ServoAnimationRule { + pub _address: u8, + } + impl Clone for ServoAnimationRule { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AnimationPerformanceWarning { + pub _address: u8, + } + impl Clone for AnimationPerformanceWarning { + fn clone(&self) -> Self { *self } + } pub type CSSPseudoClassTypeBase = u8; #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -5542,112 +5753,6 @@ pub mod root { root::mozilla::StyleShapeSource; pub type StyleShapeOutside = root::mozilla::StyleShapeSource; - /** - * Utility class to handle animated style values - */ - #[repr(C)] - #[derive(Debug, Copy)] - pub struct StyleAnimationValue { - pub _bindgen_opaque_blob: [u64; 2usize], - } - #[repr(u32)] - /** - * The types and values for the values that we extract and animate. - */ - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_Unit { - eUnit_Null = 0, - eUnit_Normal = 1, - eUnit_Auto = 2, - eUnit_None = 3, - eUnit_Enumerated = 4, - eUnit_Visibility = 5, - eUnit_Integer = 6, - eUnit_Coord = 7, - eUnit_Percent = 8, - eUnit_Float = 9, - eUnit_Color = 10, - eUnit_CurrentColor = 11, - eUnit_ComplexColor = 12, - eUnit_Calc = 13, - eUnit_ObjectPosition = 14, - eUnit_URL = 15, - eUnit_DiscreteCSSValue = 16, - eUnit_CSSValuePair = 17, - eUnit_CSSValueTriplet = 18, - eUnit_CSSRect = 19, - eUnit_Dasharray = 20, - eUnit_Shadow = 21, - eUnit_Shape = 22, - eUnit_Filter = 23, - eUnit_Transform = 24, - eUnit_BackgroundPositionCoord = 25, - eUnit_CSSValuePairList = 26, - eUnit_UnparsedString = 27, - } - #[repr(C)] - #[derive(Debug, Copy)] - pub struct StyleAnimationValue__bindgen_ty_1 { - pub mInt: root::__BindgenUnionField, - pub mCoord: root::__BindgenUnionField, - pub mFloat: root::__BindgenUnionField, - pub mCSSValue: root::__BindgenUnionField<*mut root::nsCSSValue>, - pub mCSSValuePair: root::__BindgenUnionField<*mut root::nsCSSValuePair>, - pub mCSSValueTriplet: root::__BindgenUnionField<*mut root::nsCSSValueTriplet>, - pub mCSSRect: root::__BindgenUnionField<*mut root::nsCSSRect>, - pub mCSSValueArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>, - pub mCSSValueList: root::__BindgenUnionField<*mut root::nsCSSValueList>, - pub mCSSValueSharedList: root::__BindgenUnionField<*mut root::nsCSSValueSharedList>, - pub mCSSValuePairList: root::__BindgenUnionField<*mut root::nsCSSValuePairList>, - pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>, - pub mComplexColor: root::__BindgenUnionField<*mut root::mozilla::css::ComplexColorValue>, - pub bindgen_union_field: u64, - } - #[test] - fn bindgen_test_layout_StyleAnimationValue__bindgen_ty_1() { - assert_eq!(::std::mem::size_of::() - , 8usize); - assert_eq!(::std::mem::align_of::() - , 8usize); - } - impl Clone for StyleAnimationValue__bindgen_ty_1 { - fn clone(&self) -> Self { *self } - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_IntegerConstructorType { - IntegerConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_CoordConstructorType { - CoordConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_PercentConstructorType { - PercentConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_FloatConstructorType { - FloatConstructor = 0, - } - #[repr(u32)] - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum StyleAnimationValue_ColorConstructorType { - ColorConstructor = 0, - } - #[test] - fn bindgen_test_layout_StyleAnimationValue() { - assert_eq!(::std::mem::size_of::() , - 16usize); - assert_eq!(::std::mem::align_of::() , - 8usize); - } - impl Clone for StyleAnimationValue { - fn clone(&self) -> Self { *self } - } #[test] fn __bindgen_test_layout_template_2() { assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize); @@ -5751,7 +5856,6 @@ pub mod root { } pub type pair_first_type<_T1> = _T1; pub type pair_second_type<_T2> = _T2; - pub type pair__PCCP = [u8; 0usize]; #[repr(C)] #[derive(Debug)] pub struct atomic<_Tp> { @@ -12300,63 +12404,63 @@ pub mod root { impl Clone for nsDOMMutationObserver { fn clone(&self) -> Self { *self } } - pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_LISTENERMANAGER; - pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_PROPERTIES; - pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_ANONYMOUS_ROOT; - pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; - pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_NATIVE_ANONYMOUS_ROOT; - pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_FORCE_XBL_BINDINGS; - pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_MAY_BE_IN_BINDING_MNGR; - pub const NODE_IS_EDITABLE: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_EDITABLE; - pub const NODE_MAY_HAVE_CLASS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_MAY_HAVE_CLASS; - pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_IN_SHADOW_TREE; - pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_EMPTY_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_SLOW_SELECTOR; - pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_EDGE_CHILD_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; - pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_ALL_SELECTOR_FLAGS; - pub const NODE_NEEDS_FRAME: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_NEEDS_FRAME; - pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_DESCENDANTS_NEED_FRAMES; - pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_ACCESSKEY; - pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_DIRECTION_RTL; - pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_HAS_DIRECTION_LTR; - pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_ALL_DIRECTION_FLAGS; - pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_CHROME_ONLY_ACCESS; - pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; - pub const NODE_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_SHARED_RESTYLE_BIT_1; - pub const NODE_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_SHARED_RESTYLE_BIT_2; - pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_SHARED_RESTYLE_BIT_1; - pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_118 = - _bindgen_ty_118::NODE_TYPE_SPECIFIC_BITS_OFFSET; + pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_LISTENERMANAGER; + pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_PROPERTIES; + pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_ANONYMOUS_ROOT; + pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; + pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_NATIVE_ANONYMOUS_ROOT; + pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_FORCE_XBL_BINDINGS; + pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_MAY_BE_IN_BINDING_MNGR; + pub const NODE_IS_EDITABLE: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_EDITABLE; + pub const NODE_MAY_HAVE_CLASS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_MAY_HAVE_CLASS; + pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_IN_SHADOW_TREE; + pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_EMPTY_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_SLOW_SELECTOR; + pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_EDGE_CHILD_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; + pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_ALL_SELECTOR_FLAGS; + pub const NODE_NEEDS_FRAME: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_NEEDS_FRAME; + pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_DESCENDANTS_NEED_FRAMES; + pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_ACCESSKEY; + pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_DIRECTION_RTL; + pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_HAS_DIRECTION_LTR; + pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_ALL_DIRECTION_FLAGS; + pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_CHROME_ONLY_ACCESS; + pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; + pub const NODE_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_SHARED_RESTYLE_BIT_1; + pub const NODE_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_SHARED_RESTYLE_BIT_2; + pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_SHARED_RESTYLE_BIT_1; + pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_136 = + _bindgen_ty_136::NODE_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_118 { + pub enum _bindgen_ty_136 { NODE_HAS_LISTENERMANAGER = 4, NODE_HAS_PROPERTIES = 8, NODE_IS_ANONYMOUS_ROOT = 16, @@ -12522,6 +12626,7 @@ pub mod root { * via the "TimerFirings" log module. * * @param aTimer the timer which has expired + * @param aAnonymize whether the name should avoid including privacy sensitive info * @param aClosure opaque parameter passed to initWithFuncCallback * @param aBuf a buffer in which to put the name * @param aLen the length of the buffer @@ -12529,6 +12634,7 @@ pub mod root { pub type nsTimerNameCallbackFunc = ::std::option::Option; + pub type RawServoAnimationValueBorrowedList = + root::nsTArray<*const root::RawServoAnimationValue>; pub type RawGeckoNodeBorrowed = *const root::RawGeckoNode; pub type RawGeckoNodeBorrowedOrNull = *const root::RawGeckoNode; pub type RawGeckoElementBorrowed = *const root::RawGeckoElement; @@ -17732,10 +17840,98 @@ pub mod root { pub type RawGeckoPresContextBorrowedMut = *mut root::RawGeckoPresContext; pub type RawGeckoAnimationValueListBorrowedMut = *mut root::RawGeckoAnimationValueList; - pub type RawServoAnimationValueBorrowedList = - root::nsTArray<*const root::RawServoAnimationValue>; pub type RawServoAnimationValueBorrowedListBorrowed = *const root::RawServoAnimationValueBorrowedList; + #[repr(C)] + #[derive(Debug, Copy)] + pub struct ElementRuleProcessorData { + pub _address: u8, + } + impl Clone for ElementRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct PseudoElementRuleProcessorData { + pub _address: u8, + } + impl Clone for PseudoElementRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AnonBoxRuleProcessorData { + pub _address: u8, + } + impl Clone for AnonBoxRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct XULTreeRuleProcessorData { + pub _address: u8, + } + impl Clone for XULTreeRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct StateRuleProcessorData { + pub _address: u8, + } + impl Clone for StateRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct PseudoElementStateRuleProcessorData { + pub _address: u8, + } + impl Clone for PseudoElementStateRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct AttributeRuleProcessorData { + pub _address: u8, + } + impl Clone for AttributeRuleProcessorData { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsIStyleRuleProcessor { + pub _base: root::nsISupports, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct nsIStyleRuleProcessor_COMTypeInfo { + pub _address: u8, + pub _phantom_0: ::std::marker::PhantomData, + pub _phantom_1: ::std::marker::PhantomData, + } + pub type nsIStyleRuleProcessor_EnumFunc = + ::std::option::Option bool>; + #[test] + fn bindgen_test_layout_nsIStyleRuleProcessor() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); + } + impl Clone for nsIStyleRuleProcessor { + fn clone(&self) -> Self { *self } + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsIStyleRule { + pub _address: u8, + } + impl Clone for nsIStyleRule { + fn clone(&self) -> Self { *self } + } #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum nsCSSTokenSerializationType { @@ -19717,232 +19913,251 @@ pub mod root { } #[test] fn __bindgen_test_layout_template_41() { + assert_eq!(::std::mem::size_of::>() + , 8usize); + assert_eq!(::std::mem::align_of::>() + , 8usize); + } + #[test] + fn __bindgen_test_layout_template_42() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_42() { + fn __bindgen_test_layout_template_43() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_43() { + fn __bindgen_test_layout_template_44() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_44() { + fn __bindgen_test_layout_template_45() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_45() { + fn __bindgen_test_layout_template_46() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_46() { + fn __bindgen_test_layout_template_47() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_47() { + fn __bindgen_test_layout_template_48() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_48() { + fn __bindgen_test_layout_template_49() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_49() { + fn __bindgen_test_layout_template_50() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_50() { + fn __bindgen_test_layout_template_51() { assert_eq!(::std::mem::size_of::<[u64; 28usize]>() , 224usize); assert_eq!(::std::mem::align_of::<[u64; 28usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_51() { + fn __bindgen_test_layout_template_52() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_52() { + fn __bindgen_test_layout_template_53() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_53() { + fn __bindgen_test_layout_template_54() { assert_eq!(::std::mem::size_of::<[u64; 5usize]>() , 40usize); assert_eq!(::std::mem::align_of::<[u64; 5usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_54() { + fn __bindgen_test_layout_template_55() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_55() { + fn __bindgen_test_layout_template_56() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_56() { + fn __bindgen_test_layout_template_57() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_57() { + fn __bindgen_test_layout_template_58() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_58() { + fn __bindgen_test_layout_template_59() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_59() { + fn __bindgen_test_layout_template_60() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_60() { + fn __bindgen_test_layout_template_61() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_61() { + fn __bindgen_test_layout_template_62() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_62() { + fn __bindgen_test_layout_template_63() { assert_eq!(::std::mem::size_of::>>() , 8usize); assert_eq!(::std::mem::align_of::>>() , 8usize); } #[test] - fn __bindgen_test_layout_template_63() { + fn __bindgen_test_layout_template_64() { assert_eq!(::std::mem::size_of::>() , 24usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_64() { + fn __bindgen_test_layout_template_65() { assert_eq!(::std::mem::size_of::>() , 24usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_65() { + fn __bindgen_test_layout_template_66() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_66() { + fn __bindgen_test_layout_template_67() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_67() { + fn __bindgen_test_layout_template_68() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_68() { + fn __bindgen_test_layout_template_69() { assert_eq!(::std::mem::size_of::>() , 16usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_69() { + fn __bindgen_test_layout_template_70() { + assert_eq!(::std::mem::size_of::<[u64; 5usize]>() , 40usize); + assert_eq!(::std::mem::align_of::<[u64; 5usize]>() , 8usize); + } + #[test] + fn __bindgen_test_layout_template_71() { + assert_eq!(::std::mem::size_of::>() + , 8usize); + assert_eq!(::std::mem::align_of::>() + , 8usize); + } + #[test] + fn __bindgen_test_layout_template_72() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_70() { + fn __bindgen_test_layout_template_73() { assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize); assert_eq!(::std::mem::align_of::<[u64; 2usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_71() { + fn __bindgen_test_layout_template_74() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_72() { + fn __bindgen_test_layout_template_75() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_73() { + fn __bindgen_test_layout_template_76() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_74() { + fn __bindgen_test_layout_template_77() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_75() { + fn __bindgen_test_layout_template_78() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -19951,14 +20166,14 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_76() { + fn __bindgen_test_layout_template_79() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_77() { + fn __bindgen_test_layout_template_80() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -19967,31 +20182,31 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_78() { + fn __bindgen_test_layout_template_81() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[test] - fn __bindgen_test_layout_template_79() { + fn __bindgen_test_layout_template_82() { assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize); assert_eq!(::std::mem::align_of::<[u64; 2usize]>() , 8usize); } #[test] - fn __bindgen_test_layout_template_80() { + fn __bindgen_test_layout_template_83() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_81() { + fn __bindgen_test_layout_template_84() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_82() { + fn __bindgen_test_layout_template_85() { assert_eq!(::std::mem::size_of::>>() , 8usize); @@ -20000,21 +20215,21 @@ pub mod root { , 8usize); } #[test] - fn __bindgen_test_layout_template_83() { + fn __bindgen_test_layout_template_86() { assert_eq!(::std::mem::size_of::>() , 1usize); assert_eq!(::std::mem::align_of::>() , 1usize); } #[test] - fn __bindgen_test_layout_template_84() { + fn __bindgen_test_layout_template_87() { assert_eq!(::std::mem::size_of::>() , 32usize); assert_eq!(::std::mem::align_of::>() , 8usize); } #[test] - fn __bindgen_test_layout_template_85() { + fn __bindgen_test_layout_template_88() { assert_eq!(::std::mem::size_of::>() , 8usize); assert_eq!(::std::mem::align_of::>() diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs index b487abe941f0..cae0565349e0 100644 --- a/servo/ports/geckolib/glue.rs +++ b/servo/ports/geckolib/glue.rs @@ -39,7 +39,6 @@ use style::gecko_bindings::bindings::RawGeckoAnimationValueListBorrowedMut; use style::gecko_bindings::bindings::RawGeckoElementBorrowed; use style::gecko_bindings::bindings::RawGeckoPresContextBorrowed; use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed; -use style::gecko_bindings::bindings::RawServoAnimationValueBorrowedListBorrowed; use style::gecko_bindings::bindings::RawServoAnimationValueStrong; use style::gecko_bindings::bindings::RawServoImportRuleBorrowed; use style::gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull; @@ -50,6 +49,7 @@ use style::gecko_bindings::structs::{ThreadSafePrincipalHolder, ThreadSafeURIHol use style::gecko_bindings::structs::{nsRestyleHint, nsChangeHint}; use style::gecko_bindings::structs::Loader; use style::gecko_bindings::structs::RawGeckoPresContextOwned; +use style::gecko_bindings::structs::RawServoAnimationValueBorrowedListBorrowed; use style::gecko_bindings::structs::ServoStyleSheet; use style::gecko_bindings::structs::nsresult; use style::gecko_bindings::sugar::ownership::{FFIArcHelpers, HasArcFFI, HasBoxFFI}; @@ -186,6 +186,7 @@ pub extern "C" fn Servo_AnimationValues_Interpolate(from: RawServoAnimationValue pub extern "C" fn Servo_AnimationValues_Uncompute(value: RawServoAnimationValueBorrowedListBorrowed) -> RawServoDeclarationBlockStrong { + let value = unsafe { value.as_ref().unwrap() }; let uncomputed_values = value.into_iter() .map(|v| { let raw_anim = unsafe { v.as_ref().unwrap() };