diff --git a/components/style/gecko/generated/bindings.rs b/components/style/gecko/generated/bindings.rs index 708a344eb83..df7f5f2a0db 100644 --- a/components/style/gecko/generated/bindings.rs +++ b/components/style/gecko/generated/bindings.rs @@ -66,7 +66,6 @@ use gecko_bindings::structs::StyleBasicShape; use gecko_bindings::structs::StyleBasicShapeType; use gecko_bindings::structs::StyleShapeSource; use gecko_bindings::structs::StyleTransition; -use gecko_bindings::structs::gfxFontFeatureValueSet; use gecko_bindings::structs::nsBorderColors; use gecko_bindings::structs::nsCSSCounterStyleRule; use gecko_bindings::structs::nsCSSFontFaceRule; @@ -240,7 +239,6 @@ unsafe impl Send for nsStyleTransformMatrix::MatrixTransformOperator {} unsafe impl Sync for nsStyleTransformMatrix::MatrixTransformOperator {} use gecko_bindings::structs::RawGeckoGfxMatrix4x4; pub type nsTArrayBorrowed_uintptr_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray; -pub type nsTArrayBorrowed_uint32_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray; pub type RawServoStyleSetOwned = ::gecko_bindings::sugar::ownership::Owned; pub type RawServoStyleSetOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type RawServoStyleSetBorrowed<'a> = &'a RawServoStyleSet; @@ -912,22 +910,6 @@ extern "C" { extern "C" { pub fn Gecko_nsFont_Destroy(dst: *mut nsFont); } -extern "C" { - pub fn Gecko_AppendFeatureValueHashEntry(value_set: - *mut gfxFontFeatureValueSet, - family: *mut nsIAtom, - alternate: u32, - name: *mut nsIAtom) - -> nsTArrayBorrowed_uint32_t; -} -extern "C" { - pub fn Gecko_nsFont_SetFontFeatureValuesLookup(font: *mut nsFont, - pres_context: - *const RawGeckoPresContext); -} -extern "C" { - pub fn Gecko_nsFont_ResetFontFeatureValuesLookup(font: *mut nsFont); -} extern "C" { pub fn Gecko_ClearAlternateValues(font: *mut nsFont, length: usize); } @@ -2052,13 +2034,6 @@ extern "C" { name: *mut nsIAtom) -> *mut nsCSSCounterStyleRule; } -extern "C" { - pub fn Servo_StyleSet_BuildFontFeatureValueSet(set: - RawServoStyleSetBorrowed, - list: - *mut gfxFontFeatureValueSet) - -> bool; -} extern "C" { pub fn Servo_StyleSet_ResolveForDeclarations(set: RawServoStyleSetBorrowed, diff --git a/components/style/gecko/generated/structs_debug.rs b/components/style/gecko/generated/structs_debug.rs index ff7d3d0436d..af92202568e 100644 --- a/components/style/gecko/generated/structs_debug.rs +++ b/components/style/gecko/generated/structs_debug.rs @@ -1047,6 +1047,8 @@ pub mod root { } pub type pair_first_type<_T1> = _T1; pub type pair_second_type<_T2> = _T2; + pub type pair__PCCP = u8; + pub type pair__PCCFP = u8; #[repr(C)] #[derive(Debug, Copy)] pub struct input_iterator_tag { @@ -12394,11 +12396,12 @@ pub mod root { #[repr(C)] #[derive(Debug)] pub struct gfxFontFeatureValueSet { - pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt, + pub mRefCnt: root::nsAutoRefCnt, + pub _mOwningThread: root::nsAutoOwningThread, pub mFontFeatureValues: [u64; 6usize], } pub type gfxFontFeatureValueSet_HasThreadSafeRefCnt = - root::mozilla::TrueType; + root::mozilla::FalseType; #[repr(C)] #[derive(Debug)] pub struct gfxFontFeatureValueSet_ValueList { @@ -12553,7 +12556,7 @@ pub mod root { } #[test] fn bindgen_test_layout_gfxFontFeatureValueSet() { - assert_eq!(::std::mem::size_of::() , 56usize , + assert_eq!(::std::mem::size_of::() , 64usize , concat ! ( "Size of: " , stringify ! ( gfxFontFeatureValueSet ) )); assert_eq! (::std::mem::align_of::() , 8usize @@ -12568,7 +12571,14 @@ pub mod root { )); assert_eq! (unsafe { & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . - mFontFeatureValues as * const _ as usize } , 8usize , + _mOwningThread as * const _ as usize } , 8usize , concat ! + ( + "Alignment of field: " , stringify ! ( + gfxFontFeatureValueSet ) , "::" , stringify ! ( + _mOwningThread ) )); + assert_eq! (unsafe { + & ( * ( 0 as * const gfxFontFeatureValueSet ) ) . + mFontFeatureValues as * const _ as usize } , 16usize , concat ! ( "Alignment of field: " , stringify ! ( gfxFontFeatureValueSet ) , "::" , stringify ! ( @@ -16125,7 +16135,7 @@ pub mod root { /// An object implementing nsIDOMNodeList for this content (childNodes) /// @see nsIDOMNodeList /// @see nsGenericHTMLElement::GetChildNodes - pub mChildNodes: root::RefPtr, + pub mChildNodes: root::RefPtr, /// Weak reference to this node. This is cleared by the destructor of /// nsNodeWeakReference. pub mWeakReference: *mut root::nsNodeWeakReference, @@ -20319,7 +20329,6 @@ pub mod root { pub mCounterStyleManager: root::RefPtr, pub mMedium: *mut root::nsIAtom, pub mMediaEmulated: root::nsCOMPtr, - pub mFontFeatureValuesLookup: root::RefPtr, pub mLinkHandler: *mut root::nsILinkHandler, pub mLanguage: root::nsCOMPtr, pub mInflationDisabledForShrinkWrap: bool, @@ -20378,7 +20387,7 @@ pub mod root { pub mTelemetryScrollLastY: root::nscoord, pub mTelemetryScrollMaxY: root::nscoord, pub mTelemetryScrollTotalY: root::nscoord, - pub _bitfield_1: [u8; 7usize], + pub _bitfield_1: [u8; 6usize], pub mLayoutPhaseCount: [u32; 3usize], } pub type nsPresContext_Encoding = root::mozilla::Encoding; @@ -20502,7 +20511,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsPresContext() { - assert_eq!(::std::mem::size_of::() , 1336usize , concat + assert_eq!(::std::mem::size_of::() , 1328usize , concat ! ( "Size of: " , stringify ! ( nsPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext ) )); @@ -20583,329 +20592,323 @@ pub mod root { * const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMediaEmulated ) )); - assert_eq! (unsafe { - & ( * ( 0 as * const nsPresContext ) ) . - mFontFeatureValuesLookup as * const _ as usize } , - 136usize , concat ! ( - "Alignment of field: " , stringify ! ( nsPresContext ) , - "::" , stringify ! ( mFontFeatureValuesLookup ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkHandler as * - const _ as usize } , 144usize , concat ! ( + const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkHandler ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguage as * - const _ as usize } , 152usize , concat ! ( + const _ as usize } , 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguage ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInflationDisabledForShrinkWrap as * const _ as usize } , - 160usize , concat ! ( + 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInflationDisabledForShrinkWrap ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mContainer as * - const _ as usize } , 168usize , concat ! ( + const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mContainer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBaseMinFontSize - as * const _ as usize } , 176usize , concat ! ( + as * const _ as usize } , 168usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBaseMinFontSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mSystemFontScale - as * const _ as usize } , 180usize , concat ! ( + as * const _ as usize } , 172usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mSystemFontScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextZoom as * - const _ as usize } , 184usize , concat ! ( + const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mEffectiveTextZoom as * const _ as usize } , 188usize , + mEffectiveTextZoom as * const _ as usize } , 180usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mEffectiveTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFullZoom as * - const _ as usize } , 192usize , concat ! ( + const _ as usize } , 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFullZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mOverrideDPPX as - * const _ as usize } , 196usize , concat ! ( + * const _ as usize } , 188usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mOverrideDPPX ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastFontInflationScreenSize as * const _ as usize } , - 200usize , concat ! ( + 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastFontInflationScreenSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mCurAppUnitsPerDevPixel as * const _ as usize } , 216usize + mCurAppUnitsPerDevPixel as * const _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mCurAppUnitsPerDevPixel ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mAutoQualityMinFontSizePixelsPref as * const _ as usize } - , 220usize , concat ! ( + , 212usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAutoQualityMinFontSizePixelsPref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTheme as * const - _ as usize } , 224usize , concat ! ( + _ as usize } , 216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTheme ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangService as * - const _ as usize } , 232usize , concat ! ( + const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangService ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrintSettings as - * const _ as usize } , 240usize , concat ! ( + * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrintSettings ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrefChangedTimer - as * const _ as usize } , 248usize , concat ! ( + as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrefChangedTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBidiEngine as * - const _ as usize } , 256usize , concat ! ( + const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBidiEngine ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransactions as - * const _ as usize } , 264usize , concat ! ( + * const _ as usize } , 256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransactions ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextPerf as * - const _ as usize } , 344usize , concat ! ( + const _ as usize } , 336usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextPerf ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMissingFonts as - * const _ as usize } , 352usize , concat ! ( + * const _ as usize } , 344usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMissingFonts ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisibleArea as * - const _ as usize } , 360usize , concat ! ( + const _ as usize } , 352usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisibleArea ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageSize as * - const _ as usize } , 376usize , concat ! ( + const _ as usize } , 368usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageScale as * - const _ as usize } , 384usize , concat ! ( + const _ as usize } , 376usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPPScale as * - const _ as usize } , 388usize , concat ! ( + const _ as usize } , 380usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPPScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDefaultColor as - * const _ as usize } , 392usize , concat ! ( + * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDefaultColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBackgroundColor - as * const _ as usize } , 396usize , concat ! ( + as * const _ as usize } , 388usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkColor as * - const _ as usize } , 400usize , concat ! ( + const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mActiveLinkColor - as * const _ as usize } , 404usize , concat ! ( + as * const _ as usize } , 396usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mActiveLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisitedLinkColor - as * const _ as usize } , 408usize , concat ! ( + as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisitedLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFocusBackgroundColor as * const _ as usize } , 412usize , + mFocusBackgroundColor as * const _ as usize } , 404usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusTextColor - as * const _ as usize } , 416usize , concat ! ( + as * const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBodyTextColor as - * const _ as usize } , 420usize , concat ! ( + * const _ as usize } , 412usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBodyTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mViewportScrollbarOverrideNode as * const _ as usize } , - 424usize , concat ! ( + 416usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportScrollbarOverrideNode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mViewportStyleScrollbar as * const _ as usize } , 432usize + mViewportStyleScrollbar as * const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportStyleScrollbar ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusRingWidth - as * const _ as usize } , 496usize , concat ! ( + as * const _ as usize } , 488usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusRingWidth ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mExistThrottledUpdates as * const _ as usize } , 497usize + mExistThrottledUpdates as * const _ as usize } , 489usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mExistThrottledUpdates ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationMode as * const _ as usize } , 498usize , + mImageAnimationMode as * const _ as usize } , 490usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationMode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationModePref as * const _ as usize } , 500usize + mImageAnimationModePref as * const _ as usize } , 492usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationModePref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mLangGroupFontPrefs as * const _ as usize } , 504usize , + mLangGroupFontPrefs as * const _ as usize } , 496usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangGroupFontPrefs ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFontGroupCacheDirty as * const _ as usize } , 1144usize , + mFontGroupCacheDirty as * const _ as usize } , 1136usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFontGroupCacheDirty ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguagesUsed as - * const _ as usize } , 1152usize , concat ! ( + * const _ as usize } , 1144usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguagesUsed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBorderWidthTable - as * const _ as usize } , 1200usize , concat ! ( + as * const _ as usize } , 1192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBorderWidthTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mInterruptChecksToSkip as * const _ as usize } , 1212usize + mInterruptChecksToSkip as * const _ as usize } , 1204usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInterruptChecksToSkip ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mElementsRestyled - as * const _ as usize } , 1216usize , concat ! ( + as * const _ as usize } , 1208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mElementsRestyled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFramesConstructed as * const _ as usize } , 1224usize , + mFramesConstructed as * const _ as usize } , 1216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesConstructed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesReflowed - as * const _ as usize } , 1232usize , concat ! ( + as * const _ as usize } , 1224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesReflowed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mReflowStartTime - as * const _ as usize } , 1240usize , concat ! ( + as * const _ as usize } , 1232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mReflowStartTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstNonBlankPaintTime as * const _ as usize } , - 1248usize , concat ! ( + 1240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstNonBlankPaintTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstClickTime - as * const _ as usize } , 1256usize , concat ! ( + as * const _ as usize } , 1248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstClickTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstKeyTime as - * const _ as usize } , 1264usize , concat ! ( + * const _ as usize } , 1256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstKeyTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFirstMouseMoveTime as * const _ as usize } , 1272usize , + mFirstMouseMoveTime as * const _ as usize } , 1264usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstMouseMoveTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstScrollTime - as * const _ as usize } , 1280usize , concat ! ( + as * const _ as usize } , 1272usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstScrollTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInteractionTimeEnabled as * const _ as usize } , - 1288usize , concat ! ( + 1280usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInteractionTimeEnabled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastStyleUpdateForAllAnimations as * const _ as usize } , - 1296usize , concat ! ( + 1288usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastStyleUpdateForAllAnimations ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollLastY as * const _ as usize } , 1304usize + mTelemetryScrollLastY as * const _ as usize } , 1296usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollLastY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollMaxY as * const _ as usize } , 1308usize , + mTelemetryScrollMaxY as * const _ as usize } , 1300usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollMaxY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollTotalY as * const _ as usize } , 1312usize + mTelemetryScrollTotalY as * const _ as usize } , 1304usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollTotalY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLayoutPhaseCount - as * const _ as usize } , 1324usize , concat ! ( + as * const _ as usize } , 1316usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLayoutPhaseCount ) )); } @@ -22152,7 +22155,7 @@ pub mod root { } } #[inline] - pub fn mFontFeatureValuesDirty(&self) -> ::std::os::raw::c_uint { + pub fn mSuppressResizeReflow(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22167,8 +22170,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mFontFeatureValuesDirty(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mSuppressResizeReflow(&mut self, + val: ::std::os::raw::c_uint) { let mask = 8589934592u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22191,8 +22194,7 @@ pub mod root { } } #[inline] - pub fn mPostedFlushFontFeatureValues(&self) - -> ::std::os::raw::c_uint { + pub fn mIsVisual(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22207,9 +22209,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPostedFlushFontFeatureValues(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mIsVisual(&mut self, val: ::std::os::raw::c_uint) { let mask = 17179869184u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22232,7 +22232,7 @@ pub mod root { } } #[inline] - pub fn mSuppressResizeReflow(&self) -> ::std::os::raw::c_uint { + pub fn mFireAfterPaintEvents(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22247,7 +22247,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mSuppressResizeReflow(&mut self, + pub fn set_mFireAfterPaintEvents(&mut self, val: ::std::os::raw::c_uint) { let mask = 34359738368u64 as u64; let val = val as u32 as u64; @@ -22271,7 +22271,7 @@ pub mod root { } } #[inline] - pub fn mIsVisual(&self) -> ::std::os::raw::c_uint { + pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22286,7 +22286,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsVisual(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { let mask = 68719476736u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22309,7 +22309,7 @@ pub mod root { } } #[inline] - pub fn mFireAfterPaintEvents(&self) -> ::std::os::raw::c_uint { + pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22324,8 +22324,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mFireAfterPaintEvents(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mIsChromeOriginImage(&mut self, + val: ::std::os::raw::c_uint) { let mask = 137438953472u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22348,7 +22348,7 @@ pub mod root { } } #[inline] - pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22363,7 +22363,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { let mask = 274877906944u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22386,7 +22386,7 @@ pub mod root { } } #[inline] - pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22401,8 +22401,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsChromeOriginImage(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashingInitialized(&mut self, + val: ::std::os::raw::c_uint) { let mask = 549755813888u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22425,7 +22425,8 @@ pub mod root { } } #[inline] - pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { + pub fn mHasWarnedAboutPositionedTableParts(&self) + -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22440,7 +22441,9 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, + val: + ::std::os::raw::c_uint) { let mask = 1099511627776u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22463,7 +22466,8 @@ pub mod root { } } #[inline] - pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { + pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius(&self) + -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22478,8 +22482,9 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPaintFlashingInitialized(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius(&mut self, + val: + ::std::os::raw::c_uint) { let mask = 2199023255552u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22502,8 +22507,7 @@ pub mod root { } } #[inline] - pub fn mHasWarnedAboutPositionedTableParts(&self) - -> ::std::os::raw::c_uint { + pub fn mQuirkSheetAdded(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22518,9 +22522,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mQuirkSheetAdded(&mut self, val: ::std::os::raw::c_uint) { let mask = 4398046511104u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22543,8 +22545,7 @@ pub mod root { } } #[inline] - pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius(&self) - -> ::std::os::raw::c_uint { + pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22559,9 +22560,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { let mask = 8796093022208u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22584,7 +22583,7 @@ pub mod root { } } #[inline] - pub fn mQuirkSheetAdded(&self) -> ::std::os::raw::c_uint { + pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22599,7 +22598,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mQuirkSheetAdded(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) { let mask = 17592186044416u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22622,7 +22621,7 @@ pub mod root { } } #[inline] - pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { + pub fn mRestyleLoggingEnabled(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22637,7 +22636,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mRestyleLoggingEnabled(&mut self, + val: ::std::os::raw::c_uint) { let mask = 35184372088832u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22660,7 +22660,7 @@ pub mod root { } } #[inline] - pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint { + pub fn mInitialized(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22675,7 +22675,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mInitialized(&mut self, val: ::std::os::raw::c_uint) { let mask = 70368744177664u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22698,83 +22698,6 @@ pub mod root { } } #[inline] - pub fn mRestyleLoggingEnabled(&self) -> ::std::os::raw::c_uint { - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - let mask = 140737488355328u64 as u64; - let val = (unit_field_val & mask) >> 47usize; - unsafe { ::std::mem::transmute(val as u32) } - } - #[inline] - pub fn set_mRestyleLoggingEnabled(&mut self, - val: ::std::os::raw::c_uint) { - let mask = 140737488355328u64 as u64; - let val = val as u32 as u64; - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - unit_field_val &= !mask; - unit_field_val |= (val << 47usize) & mask; - unsafe { - ::std::ptr::copy_nonoverlapping(&unit_field_val as *const _ as - *const u8, - &mut self._bitfield_1 as - *mut _ as *mut u8, - ::std::mem::size_of::()); - } - } - #[inline] - pub fn mInitialized(&self) -> ::std::os::raw::c_uint { - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - let mask = 281474976710656u64 as u64; - let val = (unit_field_val & mask) >> 48usize; - unsafe { ::std::mem::transmute(val as u32) } - } - #[inline] - pub fn set_mInitialized(&mut self, val: ::std::os::raw::c_uint) { - let mask = 281474976710656u64 as u64; - let val = val as u32 as u64; - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - unit_field_val &= !mask; - unit_field_val |= (val << 48usize) & mask; - unsafe { - ::std::ptr::copy_nonoverlapping(&unit_field_val as *const _ as - *const u8, - &mut self._bitfield_1 as - *mut _ as *mut u8, - ::std::mem::size_of::()); - } - } - #[inline] pub fn new_bitfield_1(mHasPendingInterrupt: ::std::os::raw::c_uint, mPendingInterruptFromTest: ::std::os::raw::c_uint, @@ -22815,9 +22738,6 @@ pub mod root { mCounterStylesDirty: ::std::os::raw::c_uint, mPostedFlushCounterStyles: ::std::os::raw::c_uint, - mFontFeatureValuesDirty: ::std::os::raw::c_uint, - mPostedFlushFontFeatureValues: - ::std::os::raw::c_uint, mSuppressResizeReflow: ::std::os::raw::c_uint, mIsVisual: ::std::os::raw::c_uint, mFireAfterPaintEvents: ::std::os::raw::c_uint, @@ -22881,449 +22801,421 @@ pub mod root { ({ ({ ({ - ({ - ({ - 0 - } - | - ((mHasPendingInterrupt - as - u32 - as - u64) - << - 0usize) - & - (1u64 - as - u64)) - } - | - ((mPendingInterruptFromTest - as - u32 - as - u64) - << - 1usize) - & - (2u64 - as - u64)) + 0 } | - ((mInterruptsEnabled + ((mHasPendingInterrupt as u32 as u64) << - 2usize) + 0usize) & - (4u64 + (1u64 as u64)) } | - ((mUseDocumentFonts + ((mPendingInterruptFromTest as u32 as u64) << - 3usize) + 1usize) & - (8u64 + (2u64 as u64)) } | - ((mUseDocumentColors + ((mInterruptsEnabled as u32 as u64) << - 4usize) + 2usize) & - (16u64 + (4u64 as u64)) } | - ((mUnderlineLinks + ((mUseDocumentFonts as u32 as u64) << - 5usize) + 3usize) & - (32u64 + (8u64 as u64)) } | - ((mSendAfterPaintToContent + ((mUseDocumentColors as u32 as u64) << - 6usize) + 4usize) & - (64u64 + (16u64 as u64)) } | - ((mUseFocusColors + ((mUnderlineLinks as u32 as u64) << - 7usize) + 5usize) & - (128u64 + (32u64 as u64)) } | - ((mFocusRingOnAnything + ((mSendAfterPaintToContent as u32 as u64) << - 8usize) + 6usize) & - (256u64 + (64u64 as u64)) } | - ((mFocusRingStyle + ((mUseFocusColors as u32 as u64) << - 9usize) + 7usize) & - (512u64 + (128u64 as u64)) } | - ((mDrawImageBackground + ((mFocusRingOnAnything as u32 as u64) << - 10usize) + 8usize) & - (1024u64 + (256u64 as u64)) } | - ((mDrawColorBackground + ((mFocusRingStyle as u32 as u64) << - 11usize) + 9usize) & - (2048u64 + (512u64 as u64)) } | - ((mNeverAnimate + ((mDrawImageBackground as u32 as u64) << - 12usize) + 10usize) & - (4096u64 + (1024u64 as u64)) } | - ((mIsRenderingOnlySelection + ((mDrawColorBackground as u32 as u64) << - 13usize) + 11usize) & - (8192u64 + (2048u64 as u64)) } | - ((mPaginated + ((mNeverAnimate as u32 as u64) << - 14usize) + 12usize) & - (16384u64 + (4096u64 as u64)) } | - ((mCanPaginatedScroll + ((mIsRenderingOnlySelection as u32 as u64) << - 15usize) + 13usize) & - (32768u64 + (8192u64 as u64)) } | - ((mDoScaledTwips + ((mPaginated as u32 as u64) << - 16usize) + 14usize) & - (65536u64 + (16384u64 as u64)) } | - ((mIsRootPaginatedDocument + ((mCanPaginatedScroll as u32 as u64) << - 17usize) + 15usize) & - (131072u64 + (32768u64 as u64)) } | - ((mPrefBidiDirection + ((mDoScaledTwips as u32 as u64) << - 18usize) + 16usize) & - (262144u64 + (65536u64 as u64)) } | - ((mPrefScrollbarSide + ((mIsRootPaginatedDocument as u32 as u64) << - 19usize) + 17usize) & - (1572864u64 + (131072u64 as u64)) } | - ((mPendingSysColorChanged + ((mPrefBidiDirection as u32 as u64) << - 21usize) + 18usize) & - (2097152u64 + (262144u64 as u64)) } | - ((mPendingThemeChanged + ((mPrefScrollbarSide as u32 as u64) << - 22usize) + 19usize) & - (4194304u64 + (1572864u64 as u64)) } | - ((mPendingUIResolutionChanged + ((mPendingSysColorChanged as u32 as u64) << - 23usize) + 21usize) & - (8388608u64 + (2097152u64 as u64)) } | - ((mPendingMediaFeatureValuesChanged + ((mPendingThemeChanged as u32 as u64) << - 24usize) + 22usize) & - (16777216u64 + (4194304u64 as u64)) } | - ((mPrefChangePendingNeedsReflow + ((mPendingUIResolutionChanged as u32 as u64) << - 25usize) + 23usize) & - (33554432u64 + (8388608u64 as u64)) } | - ((mIsEmulatingMedia + ((mPendingMediaFeatureValuesChanged as u32 as u64) << - 26usize) + 24usize) & - (67108864u64 + (16777216u64 as u64)) } | - ((mIsGlyph + ((mPrefChangePendingNeedsReflow as u32 as u64) << - 27usize) + 25usize) & - (134217728u64 + (33554432u64 as u64)) } | - ((mUsesRootEMUnits + ((mIsEmulatingMedia as u32 as u64) << - 28usize) + 26usize) & - (268435456u64 + (67108864u64 as u64)) } | - ((mUsesExChUnits + ((mIsGlyph as u32 as u64) << - 29usize) + 27usize) & - (536870912u64 + (134217728u64 as u64)) } | - ((mPendingViewportChange + ((mUsesRootEMUnits as u32 as u64) << - 30usize) + 28usize) & - (1073741824u64 + (268435456u64 as u64)) } | - ((mCounterStylesDirty + ((mUsesExChUnits as u32 as u64) << - 31usize) + 29usize) & - (2147483648u64 + (536870912u64 as u64)) } | - ((mPostedFlushCounterStyles + ((mPendingViewportChange as u32 as u64) << - 32usize) + 30usize) & - (4294967296u64 + (1073741824u64 as u64)) } | - ((mFontFeatureValuesDirty + ((mCounterStylesDirty as u32 as u64) << - 33usize) + 31usize) & - (8589934592u64 + (2147483648u64 as u64)) } | - ((mPostedFlushFontFeatureValues + ((mPostedFlushCounterStyles as u32 as u64) << - 34usize) + 32usize) & - (17179869184u64 + (4294967296u64 as u64)) } @@ -23334,9 +23226,9 @@ pub mod root { as u64) << - 35usize) + 33usize) & - (34359738368u64 + (8589934592u64 as u64)) } | @@ -23346,9 +23238,9 @@ pub mod root { as u64) << - 36usize) + 34usize) & - (68719476736u64 + (17179869184u64 as u64)) } | @@ -23358,9 +23250,9 @@ pub mod root { as u64) << - 37usize) + 35usize) & - (137438953472u64 + (34359738368u64 as u64)) } | @@ -23370,56 +23262,56 @@ pub mod root { as u64) << - 38usize) + 36usize) & - (274877906944u64 + (68719476736u64 as u64)) } | ((mIsChromeOriginImage as u32 as u64) << - 39usize) & - (549755813888u64 + 37usize) & + (137438953472u64 as u64)) } | ((mPaintFlashing as u32 as u64) << - 40usize) & - (1099511627776u64 + 38usize) & + (274877906944u64 as u64)) } | ((mPaintFlashingInitialized as u32 as u64) << - 41usize) & - (2199023255552u64 as + 39usize) & + (549755813888u64 as u64)) } | ((mHasWarnedAboutPositionedTableParts as u32 as u64) << - 42usize) & - (4398046511104u64 as u64)) + 40usize) & + (1099511627776u64 as u64)) } | ((mHasWarnedAboutTooLargeDashedOrDottedRadius - as u32 as u64) << 43usize) & - (8796093022208u64 as u64)) + as u32 as u64) << 41usize) & + (2199023255552u64 as u64)) } | ((mQuirkSheetAdded as u32 as u64) << - 44usize) & - (17592186044416u64 as u64)) + 42usize) & + (4398046511104u64 as u64)) } | - ((mNeedsPrefUpdate as u32 as u64) << 45usize) - & (35184372088832u64 as u64)) + ((mNeedsPrefUpdate as u32 as u64) << 43usize) + & (8796093022208u64 as u64)) } | - ((mHadNonBlankPaint as u32 as u64) << 46usize) & - (70368744177664u64 as u64)) + ((mHadNonBlankPaint as u32 as u64) << 44usize) & + (17592186044416u64 as u64)) } | - ((mRestyleLoggingEnabled as u32 as u64) << 47usize) & - (140737488355328u64 as u64)) + ((mRestyleLoggingEnabled as u32 as u64) << 45usize) & + (35184372088832u64 as u64)) } | - ((mInitialized as u32 as u64) << 48usize) & - (281474976710656u64 as u64)) + ((mInitialized as u32 as u64) << 46usize) & + (70368744177664u64 as u64)) } } pub type gfxSize = [u64; 2usize]; @@ -23926,7 +23818,7 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct nsAttrChildContentList { + pub struct nsChildContentList { _unused: [u8; 0], } #[repr(C)] @@ -25315,57 +25207,57 @@ pub mod root { pub struct nsRange { _unused: [u8; 0], } - pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_LISTENERMANAGER; - pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_PROPERTIES; - pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_ANONYMOUS_ROOT; - pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; - pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_NATIVE_ANONYMOUS_ROOT; - pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_FORCE_XBL_BINDINGS; - pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_MAY_BE_IN_BINDING_MNGR; - pub const NODE_IS_EDITABLE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_EDITABLE; - pub const NODE_IS_NATIVE_ANONYMOUS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_NATIVE_ANONYMOUS; - pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_IN_SHADOW_TREE; - pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_EMPTY_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_SLOW_SELECTOR; - pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_EDGE_CHILD_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; - pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_ALL_SELECTOR_FLAGS; - pub const NODE_NEEDS_FRAME: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_NEEDS_FRAME; - pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_DESCENDANTS_NEED_FRAMES; - pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_ACCESSKEY; - pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_DIRECTION_RTL; - pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_DIRECTION_LTR; - pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_ALL_DIRECTION_FLAGS; - pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_CHROME_ONLY_ACCESS; - pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; - pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_TYPE_SPECIFIC_BITS_OFFSET; + pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_LISTENERMANAGER; + pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_PROPERTIES; + pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_ANONYMOUS_ROOT; + pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; + pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_NATIVE_ANONYMOUS_ROOT; + pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_FORCE_XBL_BINDINGS; + pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_MAY_BE_IN_BINDING_MNGR; + pub const NODE_IS_EDITABLE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_EDITABLE; + pub const NODE_IS_NATIVE_ANONYMOUS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_NATIVE_ANONYMOUS; + pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_IN_SHADOW_TREE; + pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_EMPTY_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_SLOW_SELECTOR; + pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_EDGE_CHILD_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; + pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_ALL_SELECTOR_FLAGS; + pub const NODE_NEEDS_FRAME: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_NEEDS_FRAME; + pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_DESCENDANTS_NEED_FRAMES; + pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_ACCESSKEY; + pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_DIRECTION_RTL; + pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_DIRECTION_LTR; + pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_ALL_DIRECTION_FLAGS; + pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_CHROME_ONLY_ACCESS; + pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; + pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_83 { + pub enum _bindgen_ty_72 { NODE_HAS_LISTENERMANAGER = 4, NODE_HAS_PROPERTIES = 8, NODE_IS_ANONYMOUS_ROOT = 16, @@ -26647,11 +26539,6 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct nsCSSFontFeatureValuesRule { - _unused: [u8; 0], - } - #[repr(C)] - #[derive(Debug, Copy, Clone)] pub struct nsTransitionManager { _unused: [u8; 0], } @@ -32948,46 +32835,46 @@ pub mod root { assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISMILAttr ) )); } - pub const ELEMENT_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; - pub const ELEMENT_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_SHARED_RESTYLE_BIT_3: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; - pub const ELEMENT_SHARED_RESTYLE_BIT_4: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_SHARED_RESTYLE_BIT_3: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; + pub const ELEMENT_SHARED_RESTYLE_BIT_4: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; pub const ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO: - root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_HAS_SNAPSHOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; - pub const ELEMENT_HANDLED_SNAPSHOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_HAS_PENDING_RESTYLE: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; - pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE: root::_bindgen_ty_85 + root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_HAS_SNAPSHOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; + pub const ELEMENT_HANDLED_SNAPSHOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_HAS_PENDING_RESTYLE: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE: root::_bindgen_ty_74 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; pub const ELEMENT_IS_POTENTIAL_ANIMATION_ONLY_RESTYLE_ROOT: - root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR; - pub const ELEMENT_PENDING_RESTYLE_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_PENDING_RESTYLE_FLAGS; - pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS; - pub const ELEMENT_ALL_RESTYLE_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_ALL_RESTYLE_FLAGS; - pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_TYPE_SPECIFIC_BITS_OFFSET; + root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR; + pub const ELEMENT_PENDING_RESTYLE_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_PENDING_RESTYLE_FLAGS; + pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS; + pub const ELEMENT_ALL_RESTYLE_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_ALL_RESTYLE_FLAGS; + pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_85 { + pub enum _bindgen_ty_74 { ELEMENT_SHARED_RESTYLE_BIT_1 = 8388608, ELEMENT_SHARED_RESTYLE_BIT_2 = 16777216, ELEMENT_SHARED_RESTYLE_BIT_3 = 33554432, @@ -33378,6 +33265,11 @@ pub mod root { pub type nsBindingList = root::nsTArray>; #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct nsCSSFontFeatureValuesRule { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct nsCSSPageRule { _unused: [u8; 0], } @@ -33814,17 +33706,6 @@ pub mod root { root::nsTArray<::std::os::raw::c_uint> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_4() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] fn __bindgen_test_layout_nsTArray_open0_gfxAlternateValue_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( @@ -33869,7 +33750,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_220510_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_203496_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34225,7 +34106,7 @@ pub mod root { root::mozilla::binding_danger::TErrorResult ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_222344_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_205330_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34280,15 +34161,15 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_RefPtr_open0_nsAttrChildContentList_close0_instantiation() { - assert_eq!(::std::mem::size_of::>() + fn __bindgen_test_layout_RefPtr_open0_nsChildContentList_close0_instantiation() { + assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( - root::RefPtr ) )); - assert_eq!(::std::mem::align_of::>() + root::RefPtr ) )); + assert_eq!(::std::mem::align_of::>() , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( - root::RefPtr ) )); + root::RefPtr ) )); } #[test] fn __bindgen_test_layout_UniquePtr_open0_nsTHashtable_open1_nsPtrHashKey_open2_nsRange_close2_close1_DefaultDelete_open1_nsTHashtable_open2_nsPtrHashKey_open3_nsRange_close3_close2_close1_close0_instantiation() { @@ -34386,7 +34267,7 @@ pub mod root { 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_227974__bindgen_ty_id_227981_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_210954__bindgen_ty_id_210961_close0_instantiation() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34634,7 +34515,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_230461_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_213453_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34702,7 +34583,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_230763_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_213755_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34814,7 +34695,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_231312_close0_instantiation() { + fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_214304_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35229,7 +35110,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_231736_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_214728_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35319,7 +35200,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_232139_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_215128_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35420,7 +35301,7 @@ pub mod root { root::nsTArray<::nsstring::nsStringRepr> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233115_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216101_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35509,7 +35390,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233420_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216406_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35520,7 +35401,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233425_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216411_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35577,7 +35458,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233916_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_216902_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35757,17 +35638,6 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::RefPtr ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::RefPtr ) )); - } - #[test] fn __bindgen_test_layout_nsCOMPtr_open0_nsIAtom_close0_instantiation_5() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( @@ -36236,7 +36106,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_236688_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_219758_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36315,7 +36185,7 @@ pub mod root { root::mozilla::DefaultDelete ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_242890_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_226043_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36348,7 +36218,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_244059_close0_instantiation() { + fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_227212_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36359,7 +36229,7 @@ pub mod root { root::JS::Heap<*mut root::JSObject> ) )); } #[test] - fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_244063_close0_instantiation() { + fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_227216_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36381,7 +36251,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_TenuredHeap_open0__bindgen_ty_id_244070_close0_instantiation() { + fn __bindgen_test_layout_TenuredHeap_open0__bindgen_ty_id_227223_close0_instantiation() { assert_eq!(::std::mem::size_of::() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36460,7 +36330,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_245175_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_228396_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36655,7 +36525,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246623_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229844_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36760,7 +36630,7 @@ pub mod root { root::nsRefPtrHashKey ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_249031_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_232252_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37461,7 +37331,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_251589_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_234810_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37698,7 +37568,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_255758_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_242622_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37709,7 +37579,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_255763_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_242627_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37797,7 +37667,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_255876_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_242740_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -38084,7 +37954,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_257462_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244326_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -38106,29 +37976,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_5() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_6() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_257634_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244488_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -38139,7 +37987,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_257639_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244493_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -38271,7 +38119,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_259892_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246732_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -38282,7 +38130,7 @@ pub mod root { root::nsTArray<*mut root::mozilla::css::DocumentRule> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_259900_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246740_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( diff --git a/components/style/gecko/generated/structs_release.rs b/components/style/gecko/generated/structs_release.rs index 6a7e959abc6..3eca68919f1 100644 --- a/components/style/gecko/generated/structs_release.rs +++ b/components/style/gecko/generated/structs_release.rs @@ -1047,6 +1047,8 @@ pub mod root { } pub type pair_first_type<_T1> = _T1; pub type pair_second_type<_T2> = _T2; + pub type pair__PCCP = u8; + pub type pair__PCCFP = u8; #[repr(C)] #[derive(Debug, Copy)] pub struct input_iterator_tag { @@ -12193,11 +12195,11 @@ pub mod root { #[repr(C)] #[derive(Debug)] pub struct gfxFontFeatureValueSet { - pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt, + pub mRefCnt: root::nsAutoRefCnt, pub mFontFeatureValues: [u64; 5usize], } pub type gfxFontFeatureValueSet_HasThreadSafeRefCnt = - root::mozilla::TrueType; + root::mozilla::FalseType; #[repr(C)] #[derive(Debug)] pub struct gfxFontFeatureValueSet_ValueList { @@ -15924,7 +15926,7 @@ pub mod root { /// An object implementing nsIDOMNodeList for this content (childNodes) /// @see nsIDOMNodeList /// @see nsGenericHTMLElement::GetChildNodes - pub mChildNodes: root::RefPtr, + pub mChildNodes: root::RefPtr, /// Weak reference to this node. This is cleared by the destructor of /// nsNodeWeakReference. pub mWeakReference: *mut root::nsNodeWeakReference, @@ -20076,7 +20078,6 @@ pub mod root { pub mCounterStyleManager: root::RefPtr, pub mMedium: *mut root::nsIAtom, pub mMediaEmulated: root::nsCOMPtr, - pub mFontFeatureValuesLookup: root::RefPtr, pub mLinkHandler: *mut root::nsILinkHandler, pub mLanguage: root::nsCOMPtr, pub mInflationDisabledForShrinkWrap: bool, @@ -20259,7 +20260,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsPresContext() { - assert_eq!(::std::mem::size_of::() , 1312usize , concat + assert_eq!(::std::mem::size_of::() , 1304usize , concat ! ( "Size of: " , stringify ! ( nsPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext ) )); @@ -20335,323 +20336,317 @@ pub mod root { * const _ as usize } , 120usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMediaEmulated ) )); - assert_eq! (unsafe { - & ( * ( 0 as * const nsPresContext ) ) . - mFontFeatureValuesLookup as * const _ as usize } , - 128usize , concat ! ( - "Alignment of field: " , stringify ! ( nsPresContext ) , - "::" , stringify ! ( mFontFeatureValuesLookup ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkHandler as * - const _ as usize } , 136usize , concat ! ( + const _ as usize } , 128usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkHandler ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguage as * - const _ as usize } , 144usize , concat ! ( + const _ as usize } , 136usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguage ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInflationDisabledForShrinkWrap as * const _ as usize } , - 152usize , concat ! ( + 144usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInflationDisabledForShrinkWrap ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mContainer as * - const _ as usize } , 160usize , concat ! ( + const _ as usize } , 152usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mContainer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBaseMinFontSize - as * const _ as usize } , 168usize , concat ! ( + as * const _ as usize } , 160usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBaseMinFontSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mSystemFontScale - as * const _ as usize } , 172usize , concat ! ( + as * const _ as usize } , 164usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mSystemFontScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextZoom as * - const _ as usize } , 176usize , concat ! ( + const _ as usize } , 168usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mEffectiveTextZoom as * const _ as usize } , 180usize , + mEffectiveTextZoom as * const _ as usize } , 172usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mEffectiveTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFullZoom as * - const _ as usize } , 184usize , concat ! ( + const _ as usize } , 176usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFullZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mOverrideDPPX as - * const _ as usize } , 188usize , concat ! ( + * const _ as usize } , 180usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mOverrideDPPX ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastFontInflationScreenSize as * const _ as usize } , - 192usize , concat ! ( + 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastFontInflationScreenSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mCurAppUnitsPerDevPixel as * const _ as usize } , 208usize + mCurAppUnitsPerDevPixel as * const _ as usize } , 200usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mCurAppUnitsPerDevPixel ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mAutoQualityMinFontSizePixelsPref as * const _ as usize } - , 212usize , concat ! ( + , 204usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAutoQualityMinFontSizePixelsPref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTheme as * const - _ as usize } , 216usize , concat ! ( + _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTheme ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangService as * - const _ as usize } , 224usize , concat ! ( + const _ as usize } , 216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangService ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrintSettings as - * const _ as usize } , 232usize , concat ! ( + * const _ as usize } , 224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrintSettings ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPrefChangedTimer - as * const _ as usize } , 240usize , concat ! ( + as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrefChangedTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBidiEngine as * - const _ as usize } , 248usize , concat ! ( + const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBidiEngine ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransactions as - * const _ as usize } , 256usize , concat ! ( + * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransactions ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextPerf as * - const _ as usize } , 336usize , concat ! ( + const _ as usize } , 328usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextPerf ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMissingFonts as - * const _ as usize } , 344usize , concat ! ( + * const _ as usize } , 336usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMissingFonts ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisibleArea as * - const _ as usize } , 352usize , concat ! ( + const _ as usize } , 344usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisibleArea ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageSize as * - const _ as usize } , 368usize , concat ! ( + const _ as usize } , 360usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageScale as * - const _ as usize } , 376usize , concat ! ( + const _ as usize } , 368usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPPScale as * - const _ as usize } , 380usize , concat ! ( + const _ as usize } , 372usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPPScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDefaultColor as - * const _ as usize } , 384usize , concat ! ( + * const _ as usize } , 376usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDefaultColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBackgroundColor - as * const _ as usize } , 388usize , concat ! ( + as * const _ as usize } , 380usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkColor as * - const _ as usize } , 392usize , concat ! ( + const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mActiveLinkColor - as * const _ as usize } , 396usize , concat ! ( + as * const _ as usize } , 388usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mActiveLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisitedLinkColor - as * const _ as usize } , 400usize , concat ! ( + as * const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisitedLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFocusBackgroundColor as * const _ as usize } , 404usize , + mFocusBackgroundColor as * const _ as usize } , 396usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusTextColor - as * const _ as usize } , 408usize , concat ! ( + as * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBodyTextColor as - * const _ as usize } , 412usize , concat ! ( + * const _ as usize } , 404usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBodyTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mViewportScrollbarOverrideNode as * const _ as usize } , - 416usize , concat ! ( + 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportScrollbarOverrideNode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mViewportStyleScrollbar as * const _ as usize } , 424usize + mViewportStyleScrollbar as * const _ as usize } , 416usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportStyleScrollbar ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusRingWidth - as * const _ as usize } , 488usize , concat ! ( + as * const _ as usize } , 480usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusRingWidth ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mExistThrottledUpdates as * const _ as usize } , 489usize + mExistThrottledUpdates as * const _ as usize } , 481usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mExistThrottledUpdates ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationMode as * const _ as usize } , 490usize , + mImageAnimationMode as * const _ as usize } , 482usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationMode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationModePref as * const _ as usize } , 492usize + mImageAnimationModePref as * const _ as usize } , 484usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationModePref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mLangGroupFontPrefs as * const _ as usize } , 496usize , + mLangGroupFontPrefs as * const _ as usize } , 488usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangGroupFontPrefs ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFontGroupCacheDirty as * const _ as usize } , 1136usize , + mFontGroupCacheDirty as * const _ as usize } , 1128usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFontGroupCacheDirty ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLanguagesUsed as - * const _ as usize } , 1144usize , concat ! ( + * const _ as usize } , 1136usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLanguagesUsed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBorderWidthTable - as * const _ as usize } , 1184usize , concat ! ( + as * const _ as usize } , 1176usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBorderWidthTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mInterruptChecksToSkip as * const _ as usize } , 1196usize + mInterruptChecksToSkip as * const _ as usize } , 1188usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInterruptChecksToSkip ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mElementsRestyled - as * const _ as usize } , 1200usize , concat ! ( + as * const _ as usize } , 1192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mElementsRestyled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFramesConstructed as * const _ as usize } , 1208usize , + mFramesConstructed as * const _ as usize } , 1200usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesConstructed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesReflowed - as * const _ as usize } , 1216usize , concat ! ( + as * const _ as usize } , 1208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesReflowed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mReflowStartTime - as * const _ as usize } , 1224usize , concat ! ( + as * const _ as usize } , 1216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mReflowStartTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstNonBlankPaintTime as * const _ as usize } , - 1232usize , concat ! ( + 1224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstNonBlankPaintTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstClickTime - as * const _ as usize } , 1240usize , concat ! ( + as * const _ as usize } , 1232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstClickTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstKeyTime as - * const _ as usize } , 1248usize , concat ! ( + * const _ as usize } , 1240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstKeyTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFirstMouseMoveTime as * const _ as usize } , 1256usize , + mFirstMouseMoveTime as * const _ as usize } , 1248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstMouseMoveTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstScrollTime - as * const _ as usize } , 1264usize , concat ! ( + as * const _ as usize } , 1256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstScrollTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInteractionTimeEnabled as * const _ as usize } , - 1272usize , concat ! ( + 1264usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInteractionTimeEnabled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastStyleUpdateForAllAnimations as * const _ as usize } , - 1280usize , concat ! ( + 1272usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastStyleUpdateForAllAnimations ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollLastY as * const _ as usize } , 1288usize + mTelemetryScrollLastY as * const _ as usize } , 1280usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollLastY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollMaxY as * const _ as usize } , 1292usize , + mTelemetryScrollMaxY as * const _ as usize } , 1284usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollMaxY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollTotalY as * const _ as usize } , 1296usize + mTelemetryScrollTotalY as * const _ as usize } , 1288usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollTotalY ) )); @@ -21899,7 +21894,7 @@ pub mod root { } } #[inline] - pub fn mFontFeatureValuesDirty(&self) -> ::std::os::raw::c_uint { + pub fn mSuppressResizeReflow(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -21914,8 +21909,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mFontFeatureValuesDirty(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mSuppressResizeReflow(&mut self, + val: ::std::os::raw::c_uint) { let mask = 8589934592u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -21938,8 +21933,7 @@ pub mod root { } } #[inline] - pub fn mPostedFlushFontFeatureValues(&self) - -> ::std::os::raw::c_uint { + pub fn mIsVisual(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -21954,9 +21948,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPostedFlushFontFeatureValues(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mIsVisual(&mut self, val: ::std::os::raw::c_uint) { let mask = 17179869184u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -21979,7 +21971,7 @@ pub mod root { } } #[inline] - pub fn mSuppressResizeReflow(&self) -> ::std::os::raw::c_uint { + pub fn mFireAfterPaintEvents(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -21994,7 +21986,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mSuppressResizeReflow(&mut self, + pub fn set_mFireAfterPaintEvents(&mut self, val: ::std::os::raw::c_uint) { let mask = 34359738368u64 as u64; let val = val as u32 as u64; @@ -22018,7 +22010,7 @@ pub mod root { } } #[inline] - pub fn mIsVisual(&self) -> ::std::os::raw::c_uint { + pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22033,7 +22025,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsVisual(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { let mask = 68719476736u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22056,7 +22048,7 @@ pub mod root { } } #[inline] - pub fn mFireAfterPaintEvents(&self) -> ::std::os::raw::c_uint { + pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22071,8 +22063,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mFireAfterPaintEvents(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mIsChromeOriginImage(&mut self, + val: ::std::os::raw::c_uint) { let mask = 137438953472u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22095,7 +22087,7 @@ pub mod root { } } #[inline] - pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22110,7 +22102,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { let mask = 274877906944u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22133,7 +22125,7 @@ pub mod root { } } #[inline] - pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22148,8 +22140,8 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mIsChromeOriginImage(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashingInitialized(&mut self, + val: ::std::os::raw::c_uint) { let mask = 549755813888u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22172,7 +22164,8 @@ pub mod root { } } #[inline] - pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { + pub fn mHasWarnedAboutPositionedTableParts(&self) + -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22187,7 +22180,9 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, + val: + ::std::os::raw::c_uint) { let mask = 1099511627776u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22210,7 +22205,8 @@ pub mod root { } } #[inline] - pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { + pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius(&self) + -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22225,8 +22221,9 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mPaintFlashingInitialized(&mut self, - val: ::std::os::raw::c_uint) { + pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius(&mut self, + val: + ::std::os::raw::c_uint) { let mask = 2199023255552u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22249,8 +22246,7 @@ pub mod root { } } #[inline] - pub fn mHasWarnedAboutPositionedTableParts(&self) - -> ::std::os::raw::c_uint { + pub fn mQuirkSheetAdded(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22265,9 +22261,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mQuirkSheetAdded(&mut self, val: ::std::os::raw::c_uint) { let mask = 4398046511104u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22290,8 +22284,7 @@ pub mod root { } } #[inline] - pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius(&self) - -> ::std::os::raw::c_uint { + pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22306,9 +22299,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius(&mut self, - val: - ::std::os::raw::c_uint) { + pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { let mask = 8796093022208u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22331,7 +22322,7 @@ pub mod root { } } #[inline] - pub fn mQuirkSheetAdded(&self) -> ::std::os::raw::c_uint { + pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint { let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -22346,7 +22337,7 @@ pub mod root { unsafe { ::std::mem::transmute(val as u32) } } #[inline] - pub fn set_mQuirkSheetAdded(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) { let mask = 17592186044416u64 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = @@ -22369,82 +22360,6 @@ pub mod root { } } #[inline] - pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - let mask = 35184372088832u64 as u64; - let val = (unit_field_val & mask) >> 45usize; - unsafe { ::std::mem::transmute(val as u32) } - } - #[inline] - pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { - let mask = 35184372088832u64 as u64; - let val = val as u32 as u64; - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - unit_field_val &= !mask; - unit_field_val |= (val << 45usize) & mask; - unsafe { - ::std::ptr::copy_nonoverlapping(&unit_field_val as *const _ as - *const u8, - &mut self._bitfield_1 as - *mut _ as *mut u8, - ::std::mem::size_of::()); - } - } - #[inline] - pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint { - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - let mask = 70368744177664u64 as u64; - let val = (unit_field_val & mask) >> 46usize; - unsafe { ::std::mem::transmute(val as u32) } - } - #[inline] - pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) { - let mask = 70368744177664u64 as u64; - let val = val as u32 as u64; - let mut unit_field_val: u64 = - unsafe { ::std::mem::uninitialized() }; - unsafe { - ::std::ptr::copy_nonoverlapping(&self._bitfield_1 as *const _ - as *const u8, - &mut unit_field_val as - *mut u64 as *mut u8, - ::std::mem::size_of::()) - }; - unit_field_val &= !mask; - unit_field_val |= (val << 46usize) & mask; - unsafe { - ::std::ptr::copy_nonoverlapping(&unit_field_val as *const _ as - *const u8, - &mut self._bitfield_1 as - *mut _ as *mut u8, - ::std::mem::size_of::()); - } - } - #[inline] pub fn new_bitfield_1(mHasPendingInterrupt: ::std::os::raw::c_uint, mPendingInterruptFromTest: ::std::os::raw::c_uint, @@ -22485,9 +22400,6 @@ pub mod root { mCounterStylesDirty: ::std::os::raw::c_uint, mPostedFlushCounterStyles: ::std::os::raw::c_uint, - mFontFeatureValuesDirty: ::std::os::raw::c_uint, - mPostedFlushFontFeatureValues: - ::std::os::raw::c_uint, mSuppressResizeReflow: ::std::os::raw::c_uint, mIsVisual: ::std::os::raw::c_uint, mFireAfterPaintEvents: ::std::os::raw::c_uint, @@ -22548,448 +22460,420 @@ pub mod root { ({ ({ ({ - ({ - ({ - 0 - } - | - ((mHasPendingInterrupt - as - u32 - as - u64) - << - 0usize) - & - (1u64 - as - u64)) - } - | - ((mPendingInterruptFromTest - as - u32 - as - u64) - << - 1usize) - & - (2u64 - as - u64)) + 0 } | - ((mInterruptsEnabled + ((mHasPendingInterrupt as u32 as u64) << - 2usize) + 0usize) & - (4u64 + (1u64 as u64)) } | - ((mUseDocumentFonts + ((mPendingInterruptFromTest as u32 as u64) << - 3usize) + 1usize) & - (8u64 + (2u64 as u64)) } | - ((mUseDocumentColors + ((mInterruptsEnabled as u32 as u64) << - 4usize) + 2usize) & - (16u64 + (4u64 as u64)) } | - ((mUnderlineLinks + ((mUseDocumentFonts as u32 as u64) << - 5usize) + 3usize) & - (32u64 + (8u64 as u64)) } | - ((mSendAfterPaintToContent + ((mUseDocumentColors as u32 as u64) << - 6usize) + 4usize) & - (64u64 + (16u64 as u64)) } | - ((mUseFocusColors + ((mUnderlineLinks as u32 as u64) << - 7usize) + 5usize) & - (128u64 + (32u64 as u64)) } | - ((mFocusRingOnAnything + ((mSendAfterPaintToContent as u32 as u64) << - 8usize) + 6usize) & - (256u64 + (64u64 as u64)) } | - ((mFocusRingStyle + ((mUseFocusColors as u32 as u64) << - 9usize) + 7usize) & - (512u64 + (128u64 as u64)) } | - ((mDrawImageBackground + ((mFocusRingOnAnything as u32 as u64) << - 10usize) + 8usize) & - (1024u64 + (256u64 as u64)) } | - ((mDrawColorBackground + ((mFocusRingStyle as u32 as u64) << - 11usize) + 9usize) & - (2048u64 + (512u64 as u64)) } | - ((mNeverAnimate + ((mDrawImageBackground as u32 as u64) << - 12usize) + 10usize) & - (4096u64 + (1024u64 as u64)) } | - ((mIsRenderingOnlySelection + ((mDrawColorBackground as u32 as u64) << - 13usize) + 11usize) & - (8192u64 + (2048u64 as u64)) } | - ((mPaginated + ((mNeverAnimate as u32 as u64) << - 14usize) + 12usize) & - (16384u64 + (4096u64 as u64)) } | - ((mCanPaginatedScroll + ((mIsRenderingOnlySelection as u32 as u64) << - 15usize) + 13usize) & - (32768u64 + (8192u64 as u64)) } | - ((mDoScaledTwips + ((mPaginated as u32 as u64) << - 16usize) + 14usize) & - (65536u64 + (16384u64 as u64)) } | - ((mIsRootPaginatedDocument + ((mCanPaginatedScroll as u32 as u64) << - 17usize) + 15usize) & - (131072u64 + (32768u64 as u64)) } | - ((mPrefBidiDirection + ((mDoScaledTwips as u32 as u64) << - 18usize) + 16usize) & - (262144u64 + (65536u64 as u64)) } | - ((mPrefScrollbarSide + ((mIsRootPaginatedDocument as u32 as u64) << - 19usize) + 17usize) & - (1572864u64 + (131072u64 as u64)) } | - ((mPendingSysColorChanged + ((mPrefBidiDirection as u32 as u64) << - 21usize) + 18usize) & - (2097152u64 + (262144u64 as u64)) } | - ((mPendingThemeChanged + ((mPrefScrollbarSide as u32 as u64) << - 22usize) + 19usize) & - (4194304u64 + (1572864u64 as u64)) } | - ((mPendingUIResolutionChanged + ((mPendingSysColorChanged as u32 as u64) << - 23usize) + 21usize) & - (8388608u64 + (2097152u64 as u64)) } | - ((mPendingMediaFeatureValuesChanged + ((mPendingThemeChanged as u32 as u64) << - 24usize) + 22usize) & - (16777216u64 + (4194304u64 as u64)) } | - ((mPrefChangePendingNeedsReflow + ((mPendingUIResolutionChanged as u32 as u64) << - 25usize) + 23usize) & - (33554432u64 + (8388608u64 as u64)) } | - ((mIsEmulatingMedia + ((mPendingMediaFeatureValuesChanged as u32 as u64) << - 26usize) + 24usize) & - (67108864u64 + (16777216u64 as u64)) } | - ((mIsGlyph + ((mPrefChangePendingNeedsReflow as u32 as u64) << - 27usize) + 25usize) & - (134217728u64 + (33554432u64 as u64)) } | - ((mUsesRootEMUnits + ((mIsEmulatingMedia as u32 as u64) << - 28usize) + 26usize) & - (268435456u64 + (67108864u64 as u64)) } | - ((mUsesExChUnits + ((mIsGlyph as u32 as u64) << - 29usize) + 27usize) & - (536870912u64 + (134217728u64 as u64)) } | - ((mPendingViewportChange + ((mUsesRootEMUnits as u32 as u64) << - 30usize) + 28usize) & - (1073741824u64 + (268435456u64 as u64)) } | - ((mCounterStylesDirty + ((mUsesExChUnits as u32 as u64) << - 31usize) + 29usize) & - (2147483648u64 + (536870912u64 as u64)) } | - ((mPostedFlushCounterStyles + ((mPendingViewportChange as u32 as u64) << - 32usize) + 30usize) & - (4294967296u64 + (1073741824u64 as u64)) } | - ((mFontFeatureValuesDirty + ((mCounterStylesDirty as u32 as u64) << - 33usize) + 31usize) & - (8589934592u64 + (2147483648u64 as u64)) } | - ((mPostedFlushFontFeatureValues + ((mPostedFlushCounterStyles as u32 as u64) << - 34usize) + 32usize) & - (17179869184u64 + (4294967296u64 as u64)) } | @@ -22999,9 +22883,9 @@ pub mod root { as u64) << - 35usize) + 33usize) & - (34359738368u64 + (8589934592u64 as u64)) } | @@ -23011,56 +22895,56 @@ pub mod root { as u64) << - 36usize) + 34usize) & - (68719476736u64 + (17179869184u64 as u64)) } | ((mFireAfterPaintEvents as u32 as u64) << - 37usize) & - (137438953472u64 + 35usize) & + (34359738368u64 as u64)) } | ((mIsChrome as u32 as u64) << - 38usize) & - (274877906944u64 + 36usize) & + (68719476736u64 as u64)) } | ((mIsChromeOriginImage as u32 as u64) << - 39usize) & - (549755813888u64 as + 37usize) & + (137438953472u64 as u64)) } | ((mPaintFlashing as u32 as u64) - << 40usize) & - (1099511627776u64 as u64)) + << 38usize) & + (274877906944u64 as u64)) } | ((mPaintFlashingInitialized as u32 - as u64) << 41usize) & - (2199023255552u64 as u64)) + as u64) << 39usize) & + (549755813888u64 as u64)) } | ((mHasWarnedAboutPositionedTableParts as - u32 as u64) << 42usize) & - (4398046511104u64 as u64)) + u32 as u64) << 40usize) & + (1099511627776u64 as u64)) } | ((mHasWarnedAboutTooLargeDashedOrDottedRadius - as u32 as u64) << 43usize) & - (8796093022208u64 as u64)) + as u32 as u64) << 41usize) & + (2199023255552u64 as u64)) } | - ((mQuirkSheetAdded as u32 as u64) << 44usize) & - (17592186044416u64 as u64)) + ((mQuirkSheetAdded as u32 as u64) << 42usize) & + (4398046511104u64 as u64)) } | - ((mNeedsPrefUpdate as u32 as u64) << 45usize) & - (35184372088832u64 as u64)) + ((mNeedsPrefUpdate as u32 as u64) << 43usize) & + (8796093022208u64 as u64)) } | - ((mHadNonBlankPaint as u32 as u64) << 46usize) & - (70368744177664u64 as u64)) + ((mHadNonBlankPaint as u32 as u64) << 44usize) & + (17592186044416u64 as u64)) } } pub type gfxSize = [u64; 2usize]; @@ -23559,7 +23443,7 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct nsAttrChildContentList { + pub struct nsChildContentList { _unused: [u8; 0], } #[repr(C)] @@ -24927,57 +24811,57 @@ pub mod root { pub struct nsRange { _unused: [u8; 0], } - pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_LISTENERMANAGER; - pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_PROPERTIES; - pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_ANONYMOUS_ROOT; - pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; - pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_NATIVE_ANONYMOUS_ROOT; - pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_FORCE_XBL_BINDINGS; - pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_MAY_BE_IN_BINDING_MNGR; - pub const NODE_IS_EDITABLE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_EDITABLE; - pub const NODE_IS_NATIVE_ANONYMOUS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_NATIVE_ANONYMOUS; - pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_IN_SHADOW_TREE; - pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_EMPTY_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_SLOW_SELECTOR; - pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_EDGE_CHILD_SELECTOR; - pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; - pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_ALL_SELECTOR_FLAGS; - pub const NODE_NEEDS_FRAME: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_NEEDS_FRAME; - pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_DESCENDANTS_NEED_FRAMES; - pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_ACCESSKEY; - pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_DIRECTION_RTL; - pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_HAS_DIRECTION_LTR; - pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_ALL_DIRECTION_FLAGS; - pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_CHROME_ONLY_ACCESS; - pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; - pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_83 = - _bindgen_ty_83::NODE_TYPE_SPECIFIC_BITS_OFFSET; + pub const NODE_HAS_LISTENERMANAGER: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_LISTENERMANAGER; + pub const NODE_HAS_PROPERTIES: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_PROPERTIES; + pub const NODE_IS_ANONYMOUS_ROOT: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_ANONYMOUS_ROOT; + pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE; + pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_NATIVE_ANONYMOUS_ROOT; + pub const NODE_FORCE_XBL_BINDINGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_FORCE_XBL_BINDINGS; + pub const NODE_MAY_BE_IN_BINDING_MNGR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_MAY_BE_IN_BINDING_MNGR; + pub const NODE_IS_EDITABLE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_EDITABLE; + pub const NODE_IS_NATIVE_ANONYMOUS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_NATIVE_ANONYMOUS; + pub const NODE_IS_IN_SHADOW_TREE: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_IN_SHADOW_TREE; + pub const NODE_HAS_EMPTY_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_EMPTY_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_SLOW_SELECTOR; + pub const NODE_HAS_EDGE_CHILD_SELECTOR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_EDGE_CHILD_SELECTOR; + pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS; + pub const NODE_ALL_SELECTOR_FLAGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_ALL_SELECTOR_FLAGS; + pub const NODE_NEEDS_FRAME: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_NEEDS_FRAME; + pub const NODE_DESCENDANTS_NEED_FRAMES: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_DESCENDANTS_NEED_FRAMES; + pub const NODE_HAS_ACCESSKEY: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_ACCESSKEY; + pub const NODE_HAS_DIRECTION_RTL: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_DIRECTION_RTL; + pub const NODE_HAS_DIRECTION_LTR: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_HAS_DIRECTION_LTR; + pub const NODE_ALL_DIRECTION_FLAGS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_ALL_DIRECTION_FLAGS; + pub const NODE_CHROME_ONLY_ACCESS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_CHROME_ONLY_ACCESS; + pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS; + pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_72 = + _bindgen_ty_72::NODE_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_83 { + pub enum _bindgen_ty_72 { NODE_HAS_LISTENERMANAGER = 4, NODE_HAS_PROPERTIES = 8, NODE_IS_ANONYMOUS_ROOT = 16, @@ -26223,11 +26107,6 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct nsCSSFontFeatureValuesRule { - _unused: [u8; 0], - } - #[repr(C)] - #[derive(Debug, Copy, Clone)] pub struct nsTransitionManager { _unused: [u8; 0], } @@ -32464,46 +32343,46 @@ pub mod root { assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsISMILAttr ) )); } - pub const ELEMENT_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; - pub const ELEMENT_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_SHARED_RESTYLE_BIT_3: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; - pub const ELEMENT_SHARED_RESTYLE_BIT_4: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_SHARED_RESTYLE_BIT_1: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_SHARED_RESTYLE_BIT_2: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_SHARED_RESTYLE_BIT_3: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; + pub const ELEMENT_SHARED_RESTYLE_BIT_4: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; pub const ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO: - root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_HAS_SNAPSHOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; - pub const ELEMENT_HANDLED_SNAPSHOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_HAS_PENDING_RESTYLE: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_1; - pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_2; - pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE: root::_bindgen_ty_85 + root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_HAS_SNAPSHOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; + pub const ELEMENT_HANDLED_SNAPSHOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_HAS_PENDING_RESTYLE: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_1; + pub const ELEMENT_IS_POTENTIAL_RESTYLE_ROOT: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_2; + pub const ELEMENT_HAS_PENDING_ANIMATION_ONLY_RESTYLE: root::_bindgen_ty_74 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_3; + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_3; pub const ELEMENT_IS_POTENTIAL_ANIMATION_ONLY_RESTYLE_ROOT: - root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_SHARED_RESTYLE_BIT_4; - pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR; - pub const ELEMENT_PENDING_RESTYLE_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_PENDING_RESTYLE_FLAGS; - pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS; - pub const ELEMENT_ALL_RESTYLE_FLAGS: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_ALL_RESTYLE_FLAGS; - pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_85 = - _bindgen_ty_85::ELEMENT_TYPE_SPECIFIC_BITS_OFFSET; + root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_SHARED_RESTYLE_BIT_4; + pub const ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_IS_CONDITIONAL_RESTYLE_ANCESTOR; + pub const ELEMENT_PENDING_RESTYLE_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_PENDING_RESTYLE_FLAGS; + pub const ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_POTENTIAL_RESTYLE_ROOT_FLAGS; + pub const ELEMENT_ALL_RESTYLE_FLAGS: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_ALL_RESTYLE_FLAGS; + pub const ELEMENT_TYPE_SPECIFIC_BITS_OFFSET: root::_bindgen_ty_74 = + _bindgen_ty_74::ELEMENT_TYPE_SPECIFIC_BITS_OFFSET; #[repr(u32)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub enum _bindgen_ty_85 { + pub enum _bindgen_ty_74 { ELEMENT_SHARED_RESTYLE_BIT_1 = 8388608, ELEMENT_SHARED_RESTYLE_BIT_2 = 16777216, ELEMENT_SHARED_RESTYLE_BIT_3 = 33554432, @@ -32894,6 +32773,11 @@ pub mod root { pub type nsBindingList = root::nsTArray>; #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct nsCSSFontFeatureValuesRule { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct nsCSSPageRule { _unused: [u8; 0], } @@ -33330,17 +33214,6 @@ pub mod root { root::nsTArray<::std::os::raw::c_uint> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_4() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] fn __bindgen_test_layout_nsTArray_open0_gfxAlternateValue_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( @@ -33385,7 +33258,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217886_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_201132_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -33741,7 +33614,7 @@ pub mod root { root::mozilla::binding_danger::TErrorResult ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_219678_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_202932_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -33796,15 +33669,15 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_RefPtr_open0_nsAttrChildContentList_close0_instantiation() { - assert_eq!(::std::mem::size_of::>() + fn __bindgen_test_layout_RefPtr_open0_nsChildContentList_close0_instantiation() { + assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( - root::RefPtr ) )); - assert_eq!(::std::mem::align_of::>() + root::RefPtr ) )); + assert_eq!(::std::mem::align_of::>() , 8usize , concat ! ( "Alignment of template specialization: " , stringify ! ( - root::RefPtr ) )); + root::RefPtr ) )); } #[test] fn __bindgen_test_layout_UniquePtr_open0_nsTHashtable_open1_nsPtrHashKey_open2_nsRange_close2_close1_DefaultDelete_open1_nsTHashtable_open2_nsPtrHashKey_open3_nsRange_close3_close2_close1_close0_instantiation() { @@ -33902,7 +33775,7 @@ pub mod root { 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_225273__bindgen_ty_id_225280_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_208528__bindgen_ty_id_208535_close0_instantiation() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34150,7 +34023,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_227758_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_211025_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34218,7 +34091,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_228060_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_211327_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34330,7 +34203,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_228609_close0_instantiation() { + fn __bindgen_test_layout_NotNull_open0__bindgen_ty_id_211876_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34743,7 +34616,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229031_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_212298_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34833,7 +34706,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229432_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_212696_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -34934,7 +34807,7 @@ pub mod root { root::nsTArray<::nsstring::nsStringRepr> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_230398_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_213659_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35023,7 +34896,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_230701_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_213962_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35034,7 +34907,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_230706_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_213967_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35091,7 +34964,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_231181_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_214442_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35269,17 +35142,6 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::RefPtr ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::RefPtr ) )); - } - #[test] fn __bindgen_test_layout_nsCOMPtr_open0_nsIAtom_close0_instantiation_5() { assert_eq!(::std::mem::size_of::() , 8usize , concat ! ( @@ -35737,7 +35599,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_233923_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_217268_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35816,7 +35678,7 @@ pub mod root { root::mozilla::DefaultDelete ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_240033_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_223536_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35849,7 +35711,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_241202_close0_instantiation() { + fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_224705_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35860,7 +35722,7 @@ pub mod root { root::JS::Heap<*mut root::JSObject> ) )); } #[test] - fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_241206_close0_instantiation() { + fn __bindgen_test_layout_Heap_open0__bindgen_ty_id_224709_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35882,7 +35744,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_TenuredHeap_open0__bindgen_ty_id_241213_close0_instantiation() { + fn __bindgen_test_layout_TenuredHeap_open0__bindgen_ty_id_224716_close0_instantiation() { assert_eq!(::std::mem::size_of::() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -35961,7 +35823,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_242318_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_225889_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36156,7 +36018,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_243766_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_227337_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36261,7 +36123,7 @@ pub mod root { root::nsRefPtrHashKey ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_246139_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_229710_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -36962,7 +36824,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_248621_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_232192_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37199,7 +37061,7 @@ pub mod root { root::nsCOMPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252790_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_240004_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37210,7 +37072,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252795_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_240009_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37298,7 +37160,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_252908_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_240122_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37585,7 +37447,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_254488_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_241702_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37607,29 +37469,7 @@ pub mod root { root::RefPtr ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_5() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] - fn __bindgen_test_layout_nsTArray_open0_unsigned_int_close0_instantiation_6() { - assert_eq!(::std::mem::size_of::>() - , 8usize , concat ! ( - "Size of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - assert_eq!(::std::mem::align_of::>() - , 8usize , concat ! ( - "Alignment of template specialization: " , stringify ! ( - root::nsTArray<::std::os::raw::c_uint> ) )); - } - #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_254656_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_241860_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37640,7 +37480,7 @@ pub mod root { root::nsTArray<*mut root::nsIContent> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_254661_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_241865_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37772,7 +37612,7 @@ pub mod root { root::nsTArray ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_256904_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244094_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( @@ -37783,7 +37623,7 @@ pub mod root { root::nsTArray<*mut root::mozilla::css::DocumentRule> ) )); } #[test] - fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_256910_close0_instantiation() { + fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_244100_close0_instantiation() { assert_eq!(::std::mem::size_of::>() , 8usize , concat ! ( "Size of template specialization: " , stringify ! ( diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 8e8bae7a5aa..6f1b0d2a74f 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -2513,12 +2513,8 @@ fn static_assert() { <% impl_simple_type_with_conversion("font_language_override", "mFont.languageOverride") %> - pub fn set_font_variant_alternates(&mut self, - v: longhands::font_variant_alternates::computed_value::T, - device: &Device) { + pub fn set_font_variant_alternates(&mut self, v: longhands::font_variant_alternates::computed_value::T) { use gecko_bindings::bindings::{Gecko_ClearAlternateValues, Gecko_AppendAlternateValues}; - use gecko_bindings::bindings::Gecko_nsFont_ResetFontFeatureValuesLookup; - use gecko_bindings::bindings::Gecko_nsFont_SetFontFeatureValuesLookup; % for value in "normal swash stylistic ornaments annotation styleset character_variant historical".split(): use gecko_bindings::structs::NS_FONT_VARIANT_ALTERNATES_${value.upper()}; % endfor @@ -2530,8 +2526,6 @@ fn static_assert() { if v.0.is_empty() { self.gecko.mFont.variantAlternates = NS_FONT_VARIANT_ALTERNATES_NORMAL as u16; - unsafe { Gecko_nsFont_ResetFontFeatureValuesLookup(&mut self.gecko.mFont); } - return; } for val in v.0.iter() { @@ -2563,10 +2557,6 @@ fn static_assert() { } } } - - unsafe { - Gecko_nsFont_SetFontFeatureValuesLookup(&mut self.gecko.mFont, device.pres_context()); - } } #[allow(non_snake_case)] diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index fd10112df40..c2a5e3970c9 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2722,13 +2722,12 @@ impl<'a> StyleBuilder<'a> { &mut self, value: longhands::${property.ident}::computed_value::T ) { - <% props_need_device = ["content", "list_style_type", "font_variant_alternates"] %> self.${property.style_struct.ident}.mutate() .set_${property.ident}( value, % if property.logical: self.writing_mode, - % elif product == "gecko" and property.ident in props_need_device: + % elif product == "gecko" and property.ident in ["content", "list_style_type"]: self.device, % endif ); diff --git a/components/style/stylesheets/font_feature_values_rule.rs b/components/style/stylesheets/font_feature_values_rule.rs index c76c5b09833..3d765616367 100644 --- a/components/style/stylesheets/font_feature_values_rule.rs +++ b/components/style/stylesheets/font_feature_values_rule.rs @@ -11,10 +11,6 @@ use computed_values::font_family::FamilyName; use cssparser::{AtRuleParser, AtRuleType, BasicParseError, DeclarationListParser, DeclarationParser, Parser}; use cssparser::{CowRcStr, RuleListParser, SourceLocation, QualifiedRuleParser, Token, serialize_identifier}; use error_reporting::{ContextualParseError, ParseErrorReporter}; -#[cfg(feature = "gecko")] -use gecko_bindings::bindings::Gecko_AppendFeatureValueHashEntry; -#[cfg(feature = "gecko")] -use gecko_bindings::structs::{self, gfxFontFeatureValueSet, nsTArray}; use parser::{ParserContext, ParserErrorContext, Parse}; use selectors::parser::SelectorParseError; use shared_lock::{SharedRwLockReadGuard, ToCssWithGuard}; @@ -45,13 +41,6 @@ impl ToCss for FFVDeclaration { } } -/// A trait for @font-feature-values rule to gecko values conversion. -#[cfg(feature = "gecko")] -pub trait ToGeckoFontFeatureValues { - /// Sets the equivalent of declaration to gecko `nsTArray` array. - fn to_gecko_font_feature_values(&self, array: &mut nsTArray); -} - /// A @font-feature-values block declaration value that keeps one value. #[derive(Clone, Debug, PartialEq)] pub struct SingleValue(pub u32); @@ -72,14 +61,6 @@ impl ToCss for SingleValue { } } -#[cfg(feature = "gecko")] -impl ToGeckoFontFeatureValues for SingleValue { - fn to_gecko_font_feature_values(&self, array: &mut nsTArray) { - unsafe { array.set_len_pod(1); } - array[0] = self.0 as u32; - } -} - /// A @font-feature-values block declaration value that keeps one or two values. #[derive(Clone, Debug, PartialEq)] pub struct PairValues(pub u32, pub Option); @@ -113,19 +94,6 @@ impl ToCss for PairValues { } } -#[cfg(feature = "gecko")] -impl ToGeckoFontFeatureValues for PairValues { - fn to_gecko_font_feature_values(&self, array: &mut nsTArray) { - let len = if self.1.is_some() { 2 } else { 1 }; - - unsafe { array.set_len_pod(len); } - array[0] = self.0 as u32; - if let Some(second) = self.1 { - array[1] = second as u32; - }; - } -} - /// A @font-feature-values block declaration value that keeps a list of values. #[derive(Clone, Debug, PartialEq)] pub struct VectorValues(pub Vec); @@ -168,16 +136,6 @@ impl ToCss for VectorValues { } } -#[cfg(feature = "gecko")] -impl ToGeckoFontFeatureValues for VectorValues { - fn to_gecko_font_feature_values(&self, array: &mut nsTArray) { - unsafe { array.set_len_pod(self.0.len() as u32); } - for (dest, value) in array.iter_mut().zip(self.0.iter()) { - *dest = *value; - } - } -} - /// Parses a list of `FamilyName`s. pub fn parse_family_name_list<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result, ParseError<'i>> { @@ -208,7 +166,7 @@ impl<'a, 'b, 'i, T> DeclarationParser<'i> for FFVDeclarationsParser<'a, 'b, T> -> Result<(), ParseError<'i>> { let value = input.parse_entirely(|i| T::parse(self.context, i))?; let new = FFVDeclaration { - name: Atom::from(&*name).to_ascii_lowercase(), + name: Atom::from(&*name), value: value, }; update_or_push(&mut self.declarations, new); @@ -219,7 +177,7 @@ impl<'a, 'b, 'i, T> DeclarationParser<'i> for FFVDeclarationsParser<'a, 'b, T> macro_rules! font_feature_values_blocks { ( blocks = [ - $( #[$doc: meta] $name: tt $ident: ident / $ident_camel: ident / $gecko_enum: ident: $ty: ty, )* + $( #[$doc: meta] $name: tt $ident: ident / $ident_camel: ident: $ty: ty, )* ] ) => { /// The [`@font-feature-values`][font-feature-values] at-rule. @@ -304,38 +262,6 @@ macro_rules! font_feature_values_blocks { )* Ok(()) } - - /// Returns length of all at-rules. - pub fn len(&self) -> usize { - let mut len = 0; - $( - len += self.$ident.len(); - )* - len - } - - /// Convert to Gecko gfxFontFeatureValueSet. - #[cfg(feature = "gecko")] - pub fn set_at_rules(&self, dest: *mut gfxFontFeatureValueSet) { - for ref family in self.family_names.iter() { - let family = family.name.to_ascii_lowercase(); - $( - if self.$ident.len() > 0 { - for val in self.$ident.iter() { - let mut array = unsafe { - Gecko_AppendFeatureValueHashEntry( - dest, - family.as_ptr(), - structs::$gecko_enum, - val.name.as_ptr() - ) - }; - val.value.to_gecko_font_feature_values(&mut array); - } - } - )* - } - } } impl ToCssWithGuard for FontFeatureValuesRule { @@ -440,32 +366,31 @@ font_feature_values_blocks! { #[doc = "A @swash blocksck. \ Specifies a feature name that will work with the swash() \ functional notation of font-variant-alternates."] - "swash" swash / Swash / NS_FONT_VARIANT_ALTERNATES_SWASH: SingleValue, + "swash" swash / Swash: SingleValue, #[doc = "A @stylistic block. \ Specifies a feature name that will work with the annotation() \ functional notation of font-variant-alternates."] - "stylistic" stylistic / Stylistic / NS_FONT_VARIANT_ALTERNATES_STYLISTIC: SingleValue, + "stylistic" stylistic / Stylistic: SingleValue, #[doc = "A @ornaments block. \ Specifies a feature name that will work with the ornaments() ] \ functional notation of font-variant-alternates."] - "ornaments" ornaments / Ornaments / NS_FONT_VARIANT_ALTERNATES_ORNAMENTS: SingleValue, + "ornaments" ornaments / Ornaments: SingleValue, #[doc = "A @annotation block. \ Specifies a feature name that will work with the stylistic() \ functional notation of font-variant-alternates."] - "annotation" annotation / Annotation / NS_FONT_VARIANT_ALTERNATES_ANNOTATION: SingleValue, + "annotation" annotation / Annotation: SingleValue, #[doc = "A @character-variant block. \ Specifies a feature name that will work with the styleset() \ functional notation of font-variant-alternates. The value can be a pair."] - "character-variant" character_variant / CharacterVariant / NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT: - PairValues, + "character-variant" character_variant / CharacterVariant: PairValues, #[doc = "A @styleset block. \ Specifies a feature name that will work with the character-variant() \ functional notation of font-variant-alternates. The value can be a list."] - "styleset" styleset / Styleset / NS_FONT_VARIANT_ALTERNATES_STYLESET: VectorValues, + "styleset" styleset / Styleset: VectorValues, ] } diff --git a/components/style/stylist.rs b/components/style/stylist.rs index 6e92058a96e..b8e587dad92 100644 --- a/components/style/stylist.rs +++ b/components/style/stylist.rs @@ -40,7 +40,7 @@ use std::ops; use style_traits::viewport::ViewportConstraints; use stylesheet_set::{OriginValidity, SheetRebuildKind, StylesheetSet, StylesheetIterator, StylesheetFlusher}; #[cfg(feature = "gecko")] -use stylesheets::{CounterStyleRule, FontFaceRule, FontFeatureValuesRule}; +use stylesheets::{CounterStyleRule, FontFaceRule}; use stylesheets::{CssRule, StyleRule}; use stylesheets::{StylesheetInDocument, Origin, OriginSet, PerOrigin, PerOriginIter}; use stylesheets::UserAgentStylesheets; @@ -338,19 +338,13 @@ impl DocumentCascadeData { CssRule::FontFace(ref rule) => { _extra_data .borrow_mut_for_origin(&origin) - .add_font_face(rule); - } - #[cfg(feature = "gecko")] - CssRule::FontFeatureValues(ref rule) => { - _extra_data - .borrow_mut_for_origin(&origin) - .add_font_feature_values(rule); + .add_font_face(&rule); } #[cfg(feature = "gecko")] CssRule::CounterStyle(ref rule) => { _extra_data .borrow_mut_for_origin(&origin) - .add_counter_style(guard, rule); + .add_counter_style(guard, &rule); } // We don't care about any other rule. _ => {} @@ -1522,10 +1516,6 @@ pub struct ExtraStyleData { #[cfg(feature = "gecko")] pub font_faces: Vec>>, - /// A list of effective font-feature-values rules. - #[cfg(feature = "gecko")] - pub font_feature_values: Vec>>, - /// A map of effective counter-style rules. #[cfg(feature = "gecko")] pub counter_styles: PrecomputedHashMap>>, @@ -1538,11 +1528,6 @@ impl ExtraStyleData { self.font_faces.push(rule.clone()); } - /// Add the given @font-feature-values rule. - fn add_font_feature_values(&mut self, rule: &Arc>) { - self.font_feature_values.push(rule.clone()); - } - /// Add the given @counter-style rule. fn add_counter_style( &mut self, @@ -1559,7 +1544,6 @@ impl ExtraStyleData { #[cfg(feature = "gecko")] { self.font_faces.clear(); - self.font_feature_values.clear(); self.counter_styles.clear(); } } diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index eca3ba79d68..ec4dd237121 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -88,7 +88,6 @@ use style::gecko_bindings::structs::ServoElementSnapshotTable; use style::gecko_bindings::structs::ServoTraversalFlags; use style::gecko_bindings::structs::StyleRuleInclusion; use style::gecko_bindings::structs::URLExtraData; -use style::gecko_bindings::structs::gfxFontFeatureValueSet; use style::gecko_bindings::structs::nsCSSValueSharedList; use style::gecko_bindings::structs::nsCompatibility; use style::gecko_bindings::structs::nsIDocument; @@ -3520,30 +3519,6 @@ pub extern "C" fn Servo_StyleSet_GetCounterStyleRule(raw_data: RawServoStyleSetB }).unwrap_or(ptr::null_mut()) } -#[no_mangle] -pub extern "C" fn Servo_StyleSet_BuildFontFeatureValueSet( - raw_data: RawServoStyleSetBorrowed, - set: *mut gfxFontFeatureValueSet -) -> bool { - let data = PerDocumentStyleData::from_ffi(raw_data).borrow(); - - let global_style_data = &*GLOBAL_STYLE_DATA; - let guard = global_style_data.shared_lock.read(); - - let font_feature_values_iter = data.extra_style_data - .iter_origins_rev() - .flat_map(|(d, _)| d.font_feature_values.iter()); - - let mut any_rule = false; - for src in font_feature_values_iter { - any_rule = true; - let rule = src.read_with(&guard); - rule.set_at_rules(set); - } - - any_rule -} - #[no_mangle] pub extern "C" fn Servo_StyleSet_ResolveForDeclarations( raw_data: RawServoStyleSetBorrowed,