From 4aae0e29d6ffabec1564b794abc942531c7d9380 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Mon, 27 Mar 2017 17:31:16 +0900 Subject: [PATCH] Update bindings. --- .../style/gecko_bindings/structs_debug.rs | 145 ++++++++++-------- .../style/gecko_bindings/structs_release.rs | 139 +++++++++-------- 2 files changed, 155 insertions(+), 129 deletions(-) diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs index 99a64649299..1e0a925355e 100644 --- a/components/style/gecko_bindings/structs_debug.rs +++ b/components/style/gecko_bindings/structs_debug.rs @@ -12679,7 +12679,9 @@ pub mod root { pub mInflationDisabledForShrinkWrap: bool, pub mContainer: u64, pub mBaseMinFontSize: i32, + pub mSystemFontScale: f32, pub mTextZoom: f32, + pub mEffectiveTextZoom: f32, pub mFullZoom: f32, pub mOverrideDPPX: f32, pub mLastFontInflationScreenSize: root::gfxSize, @@ -12856,7 +12858,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsPresContext() { - assert_eq!(::std::mem::size_of::() , 1312usize , concat + assert_eq!(::std::mem::size_of::() , 1320usize , concat ! ( "Size of: " , stringify ! ( nsPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext ) )); @@ -12963,280 +12965,291 @@ pub mod root { 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 } , 172usize , concat ! ( + "Alignment of field: " , stringify ! ( nsPresContext ) , + "::" , stringify ! ( mSystemFontScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextZoom as * - const _ as usize } , 172usize , 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 } , 180usize , + concat ! ( + "Alignment of field: " , stringify ! ( nsPresContext ) , + "::" , stringify ! ( mEffectiveTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFullZoom as * - const _ as usize } , 176usize , 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 } , 180usize , 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 } , - 184usize , concat ! ( + 192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastFontInflationScreenSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mCurAppUnitsPerDevPixel as * const _ as usize } , 200usize + 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 } - , 204usize , concat ! ( + , 212usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAutoQualityMinFontSizePixelsPref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTheme as * const - _ as usize } , 208usize , concat ! ( + _ as usize } , 216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTheme ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangService as * - const _ as usize } , 216usize , 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 } , 224usize , 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 } , 232usize , concat ! ( + as * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrefChangedTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPropertyTable as - * const _ as usize } , 240usize , concat ! ( + * const _ as usize } , 248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPropertyTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransactions as - * const _ as usize } , 304usize , concat ! ( + * const _ as usize } , 312usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransactions ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextPerf as * - const _ as usize } , 384usize , concat ! ( + const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextPerf ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMissingFonts as - * const _ as usize } , 392usize , concat ! ( + * const _ as usize } , 400usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMissingFonts ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisibleArea as * - const _ as usize } , 400usize , concat ! ( + const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisibleArea ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageSize as * - const _ as usize } , 416usize , concat ! ( + const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageScale as * - const _ as usize } , 424usize , concat ! ( + const _ as usize } , 432usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPPScale as * - const _ as usize } , 428usize , concat ! ( + const _ as usize } , 436usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPPScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDefaultColor as - * const _ as usize } , 432usize , concat ! ( + * const _ as usize } , 440usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDefaultColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBackgroundColor - as * const _ as usize } , 436usize , concat ! ( + as * const _ as usize } , 444usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkColor as * - const _ as usize } , 440usize , concat ! ( + const _ as usize } , 448usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mActiveLinkColor - as * const _ as usize } , 444usize , concat ! ( + as * const _ as usize } , 452usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mActiveLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisitedLinkColor - as * const _ as usize } , 448usize , concat ! ( + as * const _ as usize } , 456usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisitedLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFocusBackgroundColor as * const _ as usize } , 452usize , + mFocusBackgroundColor as * const _ as usize } , 460usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusTextColor - as * const _ as usize } , 456usize , concat ! ( + as * const _ as usize } , 464usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBodyTextColor as - * const _ as usize } , 460usize , concat ! ( + * const _ as usize } , 468usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBodyTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mViewportStyleScrollbar as * const _ as usize } , 464usize + mViewportStyleScrollbar as * const _ as usize } , 472usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportStyleScrollbar ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusRingWidth - as * const _ as usize } , 528usize , concat ! ( + as * const _ as usize } , 536usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusRingWidth ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mExistThrottledUpdates as * const _ as usize } , 529usize + mExistThrottledUpdates as * const _ as usize } , 537usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mExistThrottledUpdates ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationMode as * const _ as usize } , 530usize , + mImageAnimationMode as * const _ as usize } , 538usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationMode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationModePref as * const _ as usize } , 532usize + mImageAnimationModePref as * const _ as usize } , 540usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationModePref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mLangGroupFontPrefs as * const _ as usize } , 536usize , + mLangGroupFontPrefs as * const _ as usize } , 544usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangGroupFontPrefs ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBorderWidthTable - as * const _ as usize } , 1176usize , concat ! ( + as * const _ as usize } , 1184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBorderWidthTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mInterruptChecksToSkip as * const _ as usize } , 1188usize + mInterruptChecksToSkip as * const _ as usize } , 1196usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInterruptChecksToSkip ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mElementsRestyled - as * const _ as usize } , 1192usize , concat ! ( + as * const _ as usize } , 1200usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mElementsRestyled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFramesConstructed as * const _ as usize } , 1200usize , + mFramesConstructed as * const _ as usize } , 1208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesConstructed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesReflowed - as * const _ as usize } , 1208usize , concat ! ( + as * const _ as usize } , 1216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesReflowed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mReflowStartTime - as * const _ as usize } , 1216usize , concat ! ( + as * const _ as usize } , 1224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mReflowStartTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstNonBlankPaintTime as * const _ as usize } , - 1224usize , concat ! ( + 1232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstNonBlankPaintTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstClickTime - as * const _ as usize } , 1232usize , concat ! ( + as * const _ as usize } , 1240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstClickTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstKeyTime as - * const _ as usize } , 1240usize , concat ! ( + * const _ as usize } , 1248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstKeyTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFirstMouseMoveTime as * const _ as usize } , 1248usize , + mFirstMouseMoveTime as * const _ as usize } , 1256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstMouseMoveTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstScrollTime - as * const _ as usize } , 1256usize , concat ! ( + as * const _ as usize } , 1264usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstScrollTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInteractionTimeEnabled as * const _ as usize } , - 1264usize , concat ! ( + 1272usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInteractionTimeEnabled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastStyleUpdateForAllAnimations as * const _ as usize } , - 1272usize , concat ! ( + 1280usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastStyleUpdateForAllAnimations ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollLastY as * const _ as usize } , 1280usize + mTelemetryScrollLastY as * const _ as usize } , 1288usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollLastY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollMaxY as * const _ as usize } , 1284usize , + mTelemetryScrollMaxY as * const _ as usize } , 1292usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollMaxY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollTotalY as * const _ as usize } , 1288usize + mTelemetryScrollTotalY as * const _ as usize } , 1296usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollTotalY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mRestyleLoggingEnabled as * const _ as usize } , 1298usize + mRestyleLoggingEnabled as * const _ as usize } , 1306usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mRestyleLoggingEnabled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInitialized as * - const _ as usize } , 1299usize , concat ! ( + const _ as usize } , 1307usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInitialized ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLayoutPhaseCount - as * const _ as usize } , 1300usize , concat ! ( + as * const _ as usize } , 1308usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLayoutPhaseCount ) )); } @@ -15054,8 +15067,8 @@ pub mod root { pub mFontSizeInflationForceEnabled: bool, pub mFontSizeInflationDisabledInMasterProcess: bool, pub mFontSizeInflationEnabled: bool, - pub mPaintingIsFrozen: bool, pub mFontSizeInflationEnabledIsDirty: bool, + pub mPaintingIsFrozen: bool, pub mIsNeverPainting: bool, pub mInFlush: bool, } @@ -15538,18 +15551,18 @@ pub mod root { 430usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabled ) )); - assert_eq! (unsafe { - & ( * ( 0 as * const nsIPresShell ) ) . mPaintingIsFrozen - as * const _ as usize } , 431usize , concat ! ( - "Alignment of field: " , stringify ! ( nsIPresShell ) , - "::" , stringify ! ( mPaintingIsFrozen ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationEnabledIsDirty as * const _ as usize } , - 432usize , concat ! ( + 431usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabledIsDirty ) )); + assert_eq! (unsafe { + & ( * ( 0 as * const nsIPresShell ) ) . mPaintingIsFrozen + as * const _ as usize } , 432usize , concat ! ( + "Alignment of field: " , stringify ! ( nsIPresShell ) , + "::" , stringify ! ( mPaintingIsFrozen ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mIsNeverPainting as * const _ as usize } , 433usize , concat ! ( @@ -22314,7 +22327,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsRootPresContext() { - assert_eq!(::std::mem::size_of::() , 1472usize , + assert_eq!(::std::mem::size_of::() , 1480usize , concat ! ( "Size of: " , stringify ! ( nsRootPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , @@ -22322,37 +22335,37 @@ pub mod root { "Alignment of " , stringify ! ( nsRootPresContext ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mNotifyDidPaintTimers as * const _ as usize } , 1312usize + mNotifyDidPaintTimers as * const _ as usize } , 1320usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mNotifyDidPaintTimers ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . mApplyPluginGeometryTimer as * const _ as usize } , - 1392usize , concat ! ( + 1400usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mApplyPluginGeometryTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mRegisteredPlugins as * const _ as usize } , 1400usize , + mRegisteredPlugins as * const _ as usize } , 1408usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mRegisteredPlugins ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mWillPaintObservers as * const _ as usize } , 1448usize , + mWillPaintObservers as * const _ as usize } , 1456usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mWillPaintObservers ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . mWillPaintFallbackEvent as * const _ as usize } , - 1456usize , concat ! ( + 1464usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mWillPaintFallbackEvent ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mDOMGeneration as * const _ as usize } , 1464usize , + mDOMGeneration as * const _ as usize } , 1472usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mDOMGeneration ) )); diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs index 9ae2d19da52..f24f1bacda9 100644 --- a/components/style/gecko_bindings/structs_release.rs +++ b/components/style/gecko_bindings/structs_release.rs @@ -12214,7 +12214,9 @@ pub mod root { pub mInflationDisabledForShrinkWrap: bool, pub mContainer: u64, pub mBaseMinFontSize: i32, + pub mSystemFontScale: f32, pub mTextZoom: f32, + pub mEffectiveTextZoom: f32, pub mFullZoom: f32, pub mOverrideDPPX: f32, pub mLastFontInflationScreenSize: root::gfxSize, @@ -12389,7 +12391,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsPresContext() { - assert_eq!(::std::mem::size_of::() , 1288usize , concat + assert_eq!(::std::mem::size_of::() , 1296usize , concat ! ( "Size of: " , stringify ! ( nsPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( nsPresContext ) )); @@ -12491,263 +12493,274 @@ pub mod root { 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 } , 164usize , concat ! ( + "Alignment of field: " , stringify ! ( nsPresContext ) , + "::" , stringify ! ( mSystemFontScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextZoom as * - const _ as usize } , 164usize , 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 } , 172usize , + concat ! ( + "Alignment of field: " , stringify ! ( nsPresContext ) , + "::" , stringify ! ( mEffectiveTextZoom ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFullZoom as * - const _ as usize } , 168usize , 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 } , 172usize , 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 } , - 176usize , concat ! ( + 184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastFontInflationScreenSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mCurAppUnitsPerDevPixel as * const _ as usize } , 192usize + 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 } - , 196usize , concat ! ( + , 204usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mAutoQualityMinFontSizePixelsPref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTheme as * const - _ as usize } , 200usize , concat ! ( + _ as usize } , 208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTheme ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLangService as * - const _ as usize } , 208usize , 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 } , 216usize , 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 } , 224usize , concat ! ( + as * const _ as usize } , 232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPrefChangedTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPropertyTable as - * const _ as usize } , 232usize , concat ! ( + * const _ as usize } , 240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPropertyTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTransactions as - * const _ as usize } , 288usize , concat ! ( + * const _ as usize } , 296usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTransactions ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mTextPerf as * - const _ as usize } , 368usize , concat ! ( + const _ as usize } , 376usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTextPerf ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mMissingFonts as - * const _ as usize } , 376usize , concat ! ( + * const _ as usize } , 384usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mMissingFonts ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisibleArea as * - const _ as usize } , 384usize , concat ! ( + const _ as usize } , 392usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisibleArea ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageSize as * - const _ as usize } , 400usize , concat ! ( + const _ as usize } , 408usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageSize ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPageScale as * - const _ as usize } , 408usize , concat ! ( + const _ as usize } , 416usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPageScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mPPScale as * - const _ as usize } , 412usize , concat ! ( + const _ as usize } , 420usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mPPScale ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mDefaultColor as - * const _ as usize } , 416usize , concat ! ( + * const _ as usize } , 424usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mDefaultColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBackgroundColor - as * const _ as usize } , 420usize , concat ! ( + as * const _ as usize } , 428usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLinkColor as * - const _ as usize } , 424usize , concat ! ( + const _ as usize } , 432usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mActiveLinkColor - as * const _ as usize } , 428usize , concat ! ( + as * const _ as usize } , 436usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mActiveLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mVisitedLinkColor - as * const _ as usize } , 432usize , concat ! ( + as * const _ as usize } , 440usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mVisitedLinkColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFocusBackgroundColor as * const _ as usize } , 436usize , + mFocusBackgroundColor as * const _ as usize } , 444usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusBackgroundColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusTextColor - as * const _ as usize } , 440usize , concat ! ( + as * const _ as usize } , 448usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBodyTextColor as - * const _ as usize } , 444usize , concat ! ( + * const _ as usize } , 452usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBodyTextColor ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mViewportStyleScrollbar as * const _ as usize } , 448usize + mViewportStyleScrollbar as * const _ as usize } , 456usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mViewportStyleScrollbar ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFocusRingWidth - as * const _ as usize } , 512usize , concat ! ( + as * const _ as usize } , 520usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFocusRingWidth ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mExistThrottledUpdates as * const _ as usize } , 513usize + mExistThrottledUpdates as * const _ as usize } , 521usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mExistThrottledUpdates ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationMode as * const _ as usize } , 514usize , + mImageAnimationMode as * const _ as usize } , 522usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationMode ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mImageAnimationModePref as * const _ as usize } , 516usize + mImageAnimationModePref as * const _ as usize } , 524usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mImageAnimationModePref ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mLangGroupFontPrefs as * const _ as usize } , 520usize , + mLangGroupFontPrefs as * const _ as usize } , 528usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLangGroupFontPrefs ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mBorderWidthTable - as * const _ as usize } , 1160usize , concat ! ( + as * const _ as usize } , 1168usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mBorderWidthTable ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mInterruptChecksToSkip as * const _ as usize } , 1172usize + mInterruptChecksToSkip as * const _ as usize } , 1180usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInterruptChecksToSkip ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mElementsRestyled - as * const _ as usize } , 1176usize , concat ! ( + as * const _ as usize } , 1184usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mElementsRestyled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFramesConstructed as * const _ as usize } , 1184usize , + mFramesConstructed as * const _ as usize } , 1192usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesConstructed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFramesReflowed - as * const _ as usize } , 1192usize , concat ! ( + as * const _ as usize } , 1200usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFramesReflowed ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mReflowStartTime - as * const _ as usize } , 1200usize , concat ! ( + as * const _ as usize } , 1208usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mReflowStartTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstNonBlankPaintTime as * const _ as usize } , - 1208usize , concat ! ( + 1216usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstNonBlankPaintTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstClickTime - as * const _ as usize } , 1216usize , concat ! ( + as * const _ as usize } , 1224usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstClickTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstKeyTime as - * const _ as usize } , 1224usize , concat ! ( + * const _ as usize } , 1232usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstKeyTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mFirstMouseMoveTime as * const _ as usize } , 1232usize , + mFirstMouseMoveTime as * const _ as usize } , 1240usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstMouseMoveTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mFirstScrollTime - as * const _ as usize } , 1240usize , concat ! ( + as * const _ as usize } , 1248usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mFirstScrollTime ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mInteractionTimeEnabled as * const _ as usize } , - 1248usize , concat ! ( + 1256usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mInteractionTimeEnabled ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . mLastStyleUpdateForAllAnimations as * const _ as usize } , - 1256usize , concat ! ( + 1264usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mLastStyleUpdateForAllAnimations ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollLastY as * const _ as usize } , 1264usize + mTelemetryScrollLastY as * const _ as usize } , 1272usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollLastY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollMaxY as * const _ as usize } , 1268usize , + mTelemetryScrollMaxY as * const _ as usize } , 1276usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollMaxY ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsPresContext ) ) . - mTelemetryScrollTotalY as * const _ as usize } , 1272usize + mTelemetryScrollTotalY as * const _ as usize } , 1280usize , concat ! ( "Alignment of field: " , stringify ! ( nsPresContext ) , "::" , stringify ! ( mTelemetryScrollTotalY ) )); @@ -14520,8 +14533,8 @@ pub mod root { pub mFontSizeInflationForceEnabled: bool, pub mFontSizeInflationDisabledInMasterProcess: bool, pub mFontSizeInflationEnabled: bool, - pub mPaintingIsFrozen: bool, pub mFontSizeInflationEnabledIsDirty: bool, + pub mPaintingIsFrozen: bool, pub mIsNeverPainting: bool, pub mInFlush: bool, } @@ -14993,18 +15006,18 @@ pub mod root { 350usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabled ) )); - assert_eq! (unsafe { - & ( * ( 0 as * const nsIPresShell ) ) . mPaintingIsFrozen - as * const _ as usize } , 351usize , concat ! ( - "Alignment of field: " , stringify ! ( nsIPresShell ) , - "::" , stringify ! ( mPaintingIsFrozen ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mFontSizeInflationEnabledIsDirty as * const _ as usize } , - 352usize , concat ! ( + 351usize , concat ! ( "Alignment of field: " , stringify ! ( nsIPresShell ) , "::" , stringify ! ( mFontSizeInflationEnabledIsDirty ) )); + assert_eq! (unsafe { + & ( * ( 0 as * const nsIPresShell ) ) . mPaintingIsFrozen + as * const _ as usize } , 352usize , concat ! ( + "Alignment of field: " , stringify ! ( nsIPresShell ) , + "::" , stringify ! ( mPaintingIsFrozen ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsIPresShell ) ) . mIsNeverPainting as * const _ as usize } , 353usize , concat ! ( @@ -21688,7 +21701,7 @@ pub mod root { } #[test] fn bindgen_test_layout_nsRootPresContext() { - assert_eq!(::std::mem::size_of::() , 1440usize , + assert_eq!(::std::mem::size_of::() , 1448usize , concat ! ( "Size of: " , stringify ! ( nsRootPresContext ) )); assert_eq! (::std::mem::align_of::() , 8usize , @@ -21696,37 +21709,37 @@ pub mod root { "Alignment of " , stringify ! ( nsRootPresContext ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mNotifyDidPaintTimers as * const _ as usize } , 1288usize + mNotifyDidPaintTimers as * const _ as usize } , 1296usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mNotifyDidPaintTimers ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . mApplyPluginGeometryTimer as * const _ as usize } , - 1368usize , concat ! ( + 1376usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mApplyPluginGeometryTimer ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mRegisteredPlugins as * const _ as usize } , 1376usize , + mRegisteredPlugins as * const _ as usize } , 1384usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mRegisteredPlugins ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mWillPaintObservers as * const _ as usize } , 1416usize , + mWillPaintObservers as * const _ as usize } , 1424usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mWillPaintObservers ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . mWillPaintFallbackEvent as * const _ as usize } , - 1424usize , concat ! ( + 1432usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mWillPaintFallbackEvent ) )); assert_eq! (unsafe { & ( * ( 0 as * const nsRootPresContext ) ) . - mDOMGeneration as * const _ as usize } , 1432usize , + mDOMGeneration as * const _ as usize } , 1440usize , concat ! ( "Alignment of field: " , stringify ! ( nsRootPresContext ) , "::" , stringify ! ( mDOMGeneration ) ));