Update binding files.

3 files changed, 208 insertions, 310 deletions

diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs
index c5896b01127..89010477bee 100644
--- a/components/style/gecko_bindings/bindings.rs
+++ b/components/style/gecko_bindings/bindings.rs
@@ -17,10 +17,8 @@ use gecko_bindings::structs::RawServoDeclarationBlock;
 use gecko_bindings::structs::RawGeckoPresContext;
 use gecko_bindings::structs::RawGeckoPresContextOwned;
 use gecko_bindings::structs::RawGeckoStyleAnimationList;
-use gecko_bindings::structs::GeckoParserExtraData;
+use gecko_bindings::structs::RawGeckoURLExtraData;
 use gecko_bindings::structs::RefPtr;
-use gecko_bindings::structs::ThreadSafeURIHolder;
-use gecko_bindings::structs::ThreadSafePrincipalHolder;
 use gecko_bindings::structs::CSSPseudoClassType;
 use gecko_bindings::structs::TraversalRootBehavior;
 use gecko_bindings::structs::FontFamilyList;
@@ -43,7 +41,6 @@ use gecko_bindings::structs::nsChangeHint;
 use gecko_bindings::structs::nsCursorImage;
 use gecko_bindings::structs::nsFont;
 use gecko_bindings::structs::nsIAtom;
-use gecko_bindings::structs::nsIURI;
 use gecko_bindings::structs::nsMediaFeature;
 use gecko_bindings::structs::nsRestyleHint;
 use gecko_bindings::structs::nsStyleBackground;
@@ -371,20 +368,6 @@ extern "C" {
     pub fn Servo_StyleSet_Drop(ptr: RawServoStyleSetOwned);
 }
 extern "C" {
-    pub fn Gecko_AddRefPrincipalArbitraryThread(aPtr:
-                                                    *mut ThreadSafePrincipalHolder);
-}
-extern "C" {
-    pub fn Gecko_ReleasePrincipalArbitraryThread(aPtr:
-                                                     *mut ThreadSafePrincipalHolder);
-}
-extern "C" {
-    pub fn Gecko_AddRefURIArbitraryThread(aPtr: *mut ThreadSafeURIHolder);
-}
-extern "C" {
-    pub fn Gecko_ReleaseURIArbitraryThread(aPtr: *mut ThreadSafeURIHolder);
-}
-extern "C" {
     pub fn Gecko_ChildrenCount(node: RawGeckoNodeBorrowed) -> u32;
 }
 extern "C" {
@@ -446,9 +429,9 @@ extern "C" {
     pub fn Gecko_LoadStyleSheet(loader: *mut Loader,
                                 parent: *mut ServoStyleSheet,
                                 import_rule: RawServoImportRuleBorrowed,
-                                base_uri: *mut nsIURI, url_bytes: *const u8,
-                                url_length: u32, media_bytes: *const u8,
-                                media_length: u32);
+                                base_url_data: *mut RawGeckoURLExtraData,
+                                url_bytes: *const u8, url_length: u32,
+                                media_bytes: *const u8, media_length: u32);
 }
 extern "C" {
     pub fn Gecko_MaybeCreateStyleChildrenIterator(node: RawGeckoNodeBorrowed)
@@ -892,6 +875,14 @@ extern "C" {
     pub fn Gecko_ReleaseCSSURLValueArbitraryThread(aPtr: *mut URLValue);
 }
 extern "C" {
+    pub fn Gecko_AddRefURLExtraDataArbitraryThread(aPtr:
+                                                       *mut RawGeckoURLExtraData);
+}
+extern "C" {
+    pub fn Gecko_ReleaseURLExtraDataArbitraryThread(aPtr:
+                                                        *mut RawGeckoURLExtraData);
+}
+extern "C" {
     pub fn Gecko_FillAllBackgroundLists(layers: *mut nsStyleImageLayers,
                                         max_len: u32);
 }
@@ -1387,10 +1378,8 @@ extern "C" {
                                           data: *const nsACString,
                                           parsing_mode: SheetParsingMode,
                                           base_url: *const nsACString,
-                                          base: *mut ThreadSafeURIHolder,
-                                          referrer: *mut ThreadSafeURIHolder,
-                                          principal:
-                                              *mut ThreadSafePrincipalHolder)
+                                          extra_data:
+                                              *mut RawGeckoURLExtraData)
      -> RawServoStyleSheetStrong;
 }
 extern "C" {
@@ -1404,10 +1393,8 @@ extern "C" {
                                            gecko_stylesheet:
                                                *mut ServoStyleSheet,
                                            data: *const nsACString,
-                                           base: *mut ThreadSafeURIHolder,
-                                           referrer: *mut ThreadSafeURIHolder,
-                                           principal:
-                                               *mut ThreadSafePrincipalHolder);
+                                           extra_data:
+                                               *mut RawGeckoURLExtraData);
 }
 extern "C" {
     pub fn Servo_StyleSheet_HasRules(sheet: RawServoStyleSheetBorrowed)
@@ -1563,13 +1550,13 @@ extern "C" {
     pub fn Servo_ParseProperty(property: *const nsACString,
                                value: *const nsACString,
                                base: *const nsACString,
-                               data: *const GeckoParserExtraData)
+                               data: *mut RawGeckoURLExtraData)
      -> RawServoDeclarationBlockStrong;
 }
 extern "C" {
     pub fn Servo_ParseEasing(easing: *const nsAString,
                              base: *const nsACString,
-                             data: *const GeckoParserExtraData,
+                             data: *mut RawGeckoURLExtraData,
                              output: nsTimingFunctionBorrowedMut) -> bool;
 }
 extern "C" {
@@ -1624,7 +1611,7 @@ extern "C" {
 extern "C" {
     pub fn Servo_ParseStyleAttribute(data: *const nsACString,
                                      base: *const nsACString,
-                                     extraData: *const GeckoParserExtraData)
+                                     extra_data: *mut RawGeckoURLExtraData)
      -> RawServoDeclarationBlockStrong;
 }
 extern "C" {
@@ -1692,8 +1679,7 @@ extern "C" {
                                               value: *const nsACString,
                                               is_important: bool,
                                               base: *const nsACString,
-                                              data:
-                                                  *const GeckoParserExtraData)
+                                              data: *mut RawGeckoURLExtraData)
      -> bool;
 }
 extern "C" {
@@ -1704,7 +1690,7 @@ extern "C" {
                                                   is_important: bool,
                                                   base: *const nsACString,
                                                   data:
-                                                      *const GeckoParserExtraData)
+                                                      *mut RawGeckoURLExtraData)
      -> bool;
 }
 extern "C" {
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
index 2451724ac57..3cb0c48012b 100644
--- a/components/style/gecko_bindings/structs_debug.rs
+++ b/components/style/gecko_bindings/structs_debug.rs
@@ -5224,6 +5224,49 @@ pub mod root {
             #[derive(Debug, Copy, Clone)]
             pub struct ImageLoader([u8; 0]);
             #[repr(C)]
+            #[derive(Debug)]
+            pub struct URLExtraData {
+                pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
+                pub mBaseURI: root::RefPtr<root::nsIURI>,
+                pub mReferrer: root::RefPtr<root::nsIURI>,
+                pub mPrincipal: root::RefPtr<root::nsIPrincipal>,
+            }
+            pub type URLExtraData_HasThreadSafeRefCnt =
+                root::mozilla::TrueType;
+            #[test]
+            fn bindgen_test_layout_URLExtraData() {
+                assert_eq!(::std::mem::size_of::<URLExtraData>() , 32usize ,
+                           concat ! (
+                           "Size of: " , stringify ! ( URLExtraData ) ));
+                assert_eq! (::std::mem::align_of::<URLExtraData>() , 8usize ,
+                            concat ! (
+                            "Alignment of " , stringify ! ( URLExtraData ) ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mRefCnt as
+                            * const _ as usize } , 0usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mRefCnt )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mBaseURI
+                            as * const _ as usize } , 8usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mBaseURI )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mReferrer
+                            as * const _ as usize } , 16usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mReferrer )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mPrincipal
+                            as * const _ as usize } , 24usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mPrincipal )
+                            ));
+            }
+            #[repr(C)]
             pub struct URLValueData__bindgen_vtable {
             }
             #[repr(C)]
@@ -5232,10 +5275,8 @@ pub mod root {
                 pub vtable_: *const URLValueData__bindgen_vtable,
                 pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
                 pub mURI: root::nsMainThreadPtrHandle<root::nsIURI>,
-                pub mBaseURI: root::nsMainThreadPtrHandle<root::nsIURI>,
                 pub mString: root::RefPtr<root::nsStringBuffer>,
-                pub mReferrer: root::nsMainThreadPtrHandle<root::nsIURI>,
-                pub mOriginPrincipal: root::nsMainThreadPtrHandle<root::nsIPrincipal>,
+                pub mExtraData: root::RefPtr<root::mozilla::css::URLExtraData>,
                 pub mURIResolved: bool,
                 pub mIsLocalRef: bool,
             }
@@ -5243,7 +5284,7 @@ pub mod root {
                 root::mozilla::TrueType;
             #[test]
             fn bindgen_test_layout_URLValueData() {
-                assert_eq!(::std::mem::size_of::<URLValueData>() , 64usize ,
+                assert_eq!(::std::mem::size_of::<URLValueData>() , 48usize ,
                            concat ! (
                            "Size of: " , stringify ! ( URLValueData ) ));
                 assert_eq! (::std::mem::align_of::<URLValueData>() , 8usize ,
@@ -5261,40 +5302,27 @@ pub mod root {
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mURI ) ));
                 assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) . mBaseURI
-                            as * const _ as usize } , 24usize , concat ! (
-                            "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! ( mBaseURI )
-                            ));
-                assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) . mString as
-                            * const _ as usize } , 32usize , concat ! (
+                            * const _ as usize } , 24usize , concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mString )
                             ));
                 assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) . mReferrer
-                            as * const _ as usize } , 40usize , concat ! (
+                            & ( * ( 0 as * const URLValueData ) ) . mExtraData
+                            as * const _ as usize } , 32usize , concat ! (
                             "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! ( mReferrer )
+                            URLValueData ) , "::" , stringify ! ( mExtraData )
                             ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) .
-                            mOriginPrincipal as * const _ as usize } , 48usize
-                            , concat ! (
-                            "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! (
-                            mOriginPrincipal ) ));
-                assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) .
-                            mURIResolved as * const _ as usize } , 56usize ,
+                            mURIResolved as * const _ as usize } , 40usize ,
                             concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mURIResolved
                             ) ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) .
-                            mIsLocalRef as * const _ as usize } , 57usize ,
+                            mIsLocalRef as * const _ as usize } , 41usize ,
                             concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mIsLocalRef
@@ -5307,7 +5335,7 @@ pub mod root {
             }
             #[test]
             fn bindgen_test_layout_URLValue() {
-                assert_eq!(::std::mem::size_of::<URLValue>() , 64usize ,
+                assert_eq!(::std::mem::size_of::<URLValue>() , 48usize ,
                            concat ! ( "Size of: " , stringify ! ( URLValue )
                            ));
                 assert_eq! (::std::mem::align_of::<URLValue>() , 8usize ,
@@ -5323,7 +5351,7 @@ pub mod root {
             }
             #[test]
             fn bindgen_test_layout_ImageValue() {
-                assert_eq!(::std::mem::size_of::<ImageValue>() , 120usize ,
+                assert_eq!(::std::mem::size_of::<ImageValue>() , 104usize ,
                            concat ! ( "Size of: " , stringify ! ( ImageValue )
                            ));
                 assert_eq! (::std::mem::align_of::<ImageValue>() , 8usize ,
@@ -5331,12 +5359,12 @@ pub mod root {
                             "Alignment of " , stringify ! ( ImageValue ) ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const ImageValue ) ) . mRequests as
-                            * const _ as usize } , 64usize , concat ! (
+                            * const _ as usize } , 48usize , concat ! (
                             "Alignment of field: " , stringify ! ( ImageValue
                             ) , "::" , stringify ! ( mRequests ) ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const ImageValue ) ) . mInitialized
-                            as * const _ as usize } , 112usize , concat ! (
+                            as * const _ as usize } , 96usize , concat ! (
                             "Alignment of field: " , stringify ! ( ImageValue
                             ) , "::" , stringify ! ( mInitialized ) ));
             }
@@ -26466,6 +26494,7 @@ pub mod root {
     pub type RawGeckoElement = root::mozilla::dom::Element;
     pub type RawGeckoDocument = root::nsIDocument;
     pub type RawGeckoPresContext = root::nsPresContext;
+    pub type RawGeckoURLExtraData = root::mozilla::css::URLExtraData;
     pub type RawGeckoKeyframeList = root::nsTArray<root::mozilla::Keyframe>;
     pub type RawGeckoComputedKeyframeValuesList =
         root::nsTArray<root::nsTArray<root::mozilla::PropertyStyleAnimationValuePair>>;
@@ -26709,21 +26738,16 @@ pub mod root {
     impl Clone for nsMediaFeature {
         fn clone(&self) -> Self { *self }
     }
-    pub type ThreadSafePrincipalHolder =
-        root::nsMainThreadPtrHolder<root::nsIPrincipal>;
-    pub type ThreadSafeURIHolder = root::nsMainThreadPtrHolder<root::nsIURI>;
     #[repr(C)]
     #[derive(Debug, Copy)]
     pub struct ServoBundledURI {
         pub mURLString: *const u8,
         pub mURLStringLength: u32,
-        pub mBaseURI: *mut root::ThreadSafeURIHolder,
-        pub mReferrer: *mut root::ThreadSafeURIHolder,
-        pub mPrincipal: *mut root::ThreadSafePrincipalHolder,
+        pub mExtraData: *mut root::mozilla::css::URLExtraData,
     }
     #[test]
     fn bindgen_test_layout_ServoBundledURI() {
-        assert_eq!(::std::mem::size_of::<ServoBundledURI>() , 40usize , concat
+        assert_eq!(::std::mem::size_of::<ServoBundledURI>() , 24usize , concat
                    ! ( "Size of: " , stringify ! ( ServoBundledURI ) ));
         assert_eq! (::std::mem::align_of::<ServoBundledURI>() , 8usize ,
                     concat ! (
@@ -26740,59 +26764,15 @@ pub mod root {
                     "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
                     "::" , stringify ! ( mURLStringLength ) ));
         assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mBaseURI as *
+                    & ( * ( 0 as * const ServoBundledURI ) ) . mExtraData as *
                     const _ as usize } , 16usize , concat ! (
                     "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mBaseURI ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mReferrer as *
-                    const _ as usize } , 24usize , concat ! (
-                    "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mReferrer ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mPrincipal as *
-                    const _ as usize } , 32usize , concat ! (
-                    "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mPrincipal ) ));
+                    "::" , stringify ! ( mExtraData ) ));
     }
     impl Clone for ServoBundledURI {
         fn clone(&self) -> Self { *self }
     }
     #[repr(C)]
-    #[derive(Debug)]
-    pub struct GeckoParserExtraData {
-        pub mBaseURI: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIURI>>,
-        pub mReferrer: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIURI>>,
-        pub mPrincipal: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIPrincipal>>,
-    }
-    #[test]
-    fn bindgen_test_layout_GeckoParserExtraData() {
-        assert_eq!(::std::mem::size_of::<GeckoParserExtraData>() , 24usize ,
-                   concat ! (
-                   "Size of: " , stringify ! ( GeckoParserExtraData ) ));
-        assert_eq! (::std::mem::align_of::<GeckoParserExtraData>() , 8usize ,
-                    concat ! (
-                    "Alignment of " , stringify ! ( GeckoParserExtraData ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mBaseURI
-                    as * const _ as usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mBaseURI )
-                    ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mReferrer
-                    as * const _ as usize } , 8usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mReferrer )
-                    ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mPrincipal
-                    as * const _ as usize } , 16usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mPrincipal )
-                    ));
-    }
-    #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct nsROCSSPrimitiveValue([u8; 0]);
     #[repr(C)]
@@ -27969,54 +27949,30 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_75() {
-        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
-                   , 24usize , concat ! (
-                   "Size of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
-        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
-                   , 8usize , concat ! (
-                   "Alignment of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_76() {
-        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>>()
+        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::css::URLExtraData>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>
-                   ) ));
-        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>>()
+                   root::already_AddRefed<root::mozilla::css::URLExtraData> )
+                   ));
+        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::mozilla::css::URLExtraData>>()
                    , 8usize , concat ! (
                    "Alignment of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>
-                   ) ));
+                   root::already_AddRefed<root::mozilla::css::URLExtraData> )
+                   ));
     }
     #[test]
-    fn __bindgen_test_layout_template_77() {
-        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIPrincipal>>()
+    fn __bindgen_test_layout_template_76() {
+        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 24usize , concat ! (
                    "Size of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIPrincipal> ) ));
-        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIPrincipal>>()
-                   , 8usize , concat ! (
-                   "Alignment of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIPrincipal> ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_78() {
-        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>>()
-                   , 8usize , concat ! (
-                   "Size of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>
-                   ) ));
-        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>>()
+                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
+        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 8usize , concat ! (
                    "Alignment of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>
-                   ) ));
+                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_79() {
+    fn __bindgen_test_layout_template_77() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValueList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28027,7 +27983,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsCSSValueList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_80() {
+    fn __bindgen_test_layout_template_78() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValueList,
                                                root::mozilla::DefaultDelete<root::nsCSSValueList>>>()
                    , 8usize , concat ! (
@@ -28044,7 +28000,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_81() {
+    fn __bindgen_test_layout_template_79() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValuePairList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28057,7 +28013,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_82() {
+    fn __bindgen_test_layout_template_80() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValuePairList,
                                                root::mozilla::DefaultDelete<root::nsCSSValuePairList>>>()
                    , 8usize , concat ! (
@@ -28074,7 +28030,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_83() {
+    fn __bindgen_test_layout_template_81() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FramePropertyTable_PropertyValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28087,7 +28043,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_84() {
+    fn __bindgen_test_layout_template_82() {
         assert_eq!(::std::mem::size_of::<root::nsPtrHashKey<root::nsIFrame>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28098,7 +28054,7 @@ pub mod root {
                    root::nsPtrHashKey<root::nsIFrame> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_85() {
+    fn __bindgen_test_layout_template_83() {
         assert_eq!(::std::mem::size_of::<[u64; 6usize]>() , 48usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28109,7 +28065,7 @@ pub mod root {
                    [u64; 6usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_86() {
+    fn __bindgen_test_layout_template_84() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::mozilla::EffectCompositor_AnimationStyleRuleProcessor>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28122,7 +28078,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_87() {
+    fn __bindgen_test_layout_template_85() {
         assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28133,7 +28089,7 @@ pub mod root {
                    [u64; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_88() {
+    fn __bindgen_test_layout_template_86() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28142,7 +28098,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_89() {
+    fn __bindgen_test_layout_template_87() {
         assert_eq!(::std::mem::size_of::<[u32; 3usize]>() , 12usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28153,7 +28109,7 @@ pub mod root {
                    [u32; 3usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_90() {
+    fn __bindgen_test_layout_template_88() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsStyleImageRequest>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28164,7 +28120,7 @@ pub mod root {
                    root::already_AddRefed<root::nsStyleImageRequest> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_91() {
+    fn __bindgen_test_layout_template_89() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsStyleSides>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28175,7 +28131,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsStyleSides> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_92() {
+    fn __bindgen_test_layout_template_90() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsStyleSides,
                                                root::mozilla::DefaultDelete<root::nsStyleSides>>>()
                    , 8usize , concat ! (
@@ -28192,7 +28148,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_93() {
+    fn __bindgen_test_layout_template_91() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::CachedBorderImageData>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28205,7 +28161,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_94() {
+    fn __bindgen_test_layout_template_92() {
         assert_eq!(::std::mem::size_of::<root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr>>()
                    , 32usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28216,7 +28172,7 @@ pub mod root {
                    root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_95() {
+    fn __bindgen_test_layout_template_93() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::std::pair<::nsstring::nsStringRepr,
                                                      ::nsstring::nsStringRepr>>>()
                    , 8usize , concat ! (
@@ -28231,7 +28187,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_96() {
+    fn __bindgen_test_layout_template_94() {
         assert_eq!(::std::mem::size_of::<[u64; 18usize]>() , 144usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -28242,7 +28198,7 @@ pub mod root {
                    [u64; 18usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_97() {
+    fn __bindgen_test_layout_template_95() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::DisplayItemClip_RoundedRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28255,7 +28211,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_98() {
+    fn __bindgen_test_layout_template_96() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28266,7 +28222,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::DOMRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_99() {
+    fn __bindgen_test_layout_template_97() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28275,7 +28231,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_100() {
+    fn __bindgen_test_layout_template_98() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28286,7 +28242,7 @@ pub mod root {
                    root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_101() {
+    fn __bindgen_test_layout_template_99() {
         assert_eq!(::std::mem::size_of::<root::nsAutoPtr<root::nsMediaQuery>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
index fa6cdd8a419..8442777cbcc 100644
--- a/components/style/gecko_bindings/structs_release.rs
+++ b/components/style/gecko_bindings/structs_release.rs
@@ -5163,6 +5163,49 @@ pub mod root {
             #[derive(Debug, Copy, Clone)]
             pub struct ImageLoader([u8; 0]);
             #[repr(C)]
+            #[derive(Debug)]
+            pub struct URLExtraData {
+                pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
+                pub mBaseURI: root::RefPtr<root::nsIURI>,
+                pub mReferrer: root::RefPtr<root::nsIURI>,
+                pub mPrincipal: root::RefPtr<root::nsIPrincipal>,
+            }
+            pub type URLExtraData_HasThreadSafeRefCnt =
+                root::mozilla::TrueType;
+            #[test]
+            fn bindgen_test_layout_URLExtraData() {
+                assert_eq!(::std::mem::size_of::<URLExtraData>() , 32usize ,
+                           concat ! (
+                           "Size of: " , stringify ! ( URLExtraData ) ));
+                assert_eq! (::std::mem::align_of::<URLExtraData>() , 8usize ,
+                            concat ! (
+                            "Alignment of " , stringify ! ( URLExtraData ) ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mRefCnt as
+                            * const _ as usize } , 0usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mRefCnt )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mBaseURI
+                            as * const _ as usize } , 8usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mBaseURI )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mReferrer
+                            as * const _ as usize } , 16usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mReferrer )
+                            ));
+                assert_eq! (unsafe {
+                            & ( * ( 0 as * const URLExtraData ) ) . mPrincipal
+                            as * const _ as usize } , 24usize , concat ! (
+                            "Alignment of field: " , stringify ! (
+                            URLExtraData ) , "::" , stringify ! ( mPrincipal )
+                            ));
+            }
+            #[repr(C)]
             pub struct URLValueData__bindgen_vtable {
             }
             #[repr(C)]
@@ -5171,10 +5214,8 @@ pub mod root {
                 pub vtable_: *const URLValueData__bindgen_vtable,
                 pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
                 pub mURI: root::nsMainThreadPtrHandle<root::nsIURI>,
-                pub mBaseURI: root::nsMainThreadPtrHandle<root::nsIURI>,
                 pub mString: root::RefPtr<root::nsStringBuffer>,
-                pub mReferrer: root::nsMainThreadPtrHandle<root::nsIURI>,
-                pub mOriginPrincipal: root::nsMainThreadPtrHandle<root::nsIPrincipal>,
+                pub mExtraData: root::RefPtr<root::mozilla::css::URLExtraData>,
                 pub mURIResolved: bool,
                 pub mIsLocalRef: bool,
             }
@@ -5182,7 +5223,7 @@ pub mod root {
                 root::mozilla::TrueType;
             #[test]
             fn bindgen_test_layout_URLValueData() {
-                assert_eq!(::std::mem::size_of::<URLValueData>() , 64usize ,
+                assert_eq!(::std::mem::size_of::<URLValueData>() , 48usize ,
                            concat ! (
                            "Size of: " , stringify ! ( URLValueData ) ));
                 assert_eq! (::std::mem::align_of::<URLValueData>() , 8usize ,
@@ -5200,40 +5241,27 @@ pub mod root {
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mURI ) ));
                 assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) . mBaseURI
-                            as * const _ as usize } , 24usize , concat ! (
-                            "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! ( mBaseURI )
-                            ));
-                assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) . mString as
-                            * const _ as usize } , 32usize , concat ! (
+                            * const _ as usize } , 24usize , concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mString )
                             ));
                 assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) . mReferrer
-                            as * const _ as usize } , 40usize , concat ! (
+                            & ( * ( 0 as * const URLValueData ) ) . mExtraData
+                            as * const _ as usize } , 32usize , concat ! (
                             "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! ( mReferrer )
+                            URLValueData ) , "::" , stringify ! ( mExtraData )
                             ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) .
-                            mOriginPrincipal as * const _ as usize } , 48usize
-                            , concat ! (
-                            "Alignment of field: " , stringify ! (
-                            URLValueData ) , "::" , stringify ! (
-                            mOriginPrincipal ) ));
-                assert_eq! (unsafe {
-                            & ( * ( 0 as * const URLValueData ) ) .
-                            mURIResolved as * const _ as usize } , 56usize ,
+                            mURIResolved as * const _ as usize } , 40usize ,
                             concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mURIResolved
                             ) ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const URLValueData ) ) .
-                            mIsLocalRef as * const _ as usize } , 57usize ,
+                            mIsLocalRef as * const _ as usize } , 41usize ,
                             concat ! (
                             "Alignment of field: " , stringify ! (
                             URLValueData ) , "::" , stringify ! ( mIsLocalRef
@@ -5246,7 +5274,7 @@ pub mod root {
             }
             #[test]
             fn bindgen_test_layout_URLValue() {
-                assert_eq!(::std::mem::size_of::<URLValue>() , 64usize ,
+                assert_eq!(::std::mem::size_of::<URLValue>() , 48usize ,
                            concat ! ( "Size of: " , stringify ! ( URLValue )
                            ));
                 assert_eq! (::std::mem::align_of::<URLValue>() , 8usize ,
@@ -5261,7 +5289,7 @@ pub mod root {
             }
             #[test]
             fn bindgen_test_layout_ImageValue() {
-                assert_eq!(::std::mem::size_of::<ImageValue>() , 104usize ,
+                assert_eq!(::std::mem::size_of::<ImageValue>() , 88usize ,
                            concat ! ( "Size of: " , stringify ! ( ImageValue )
                            ));
                 assert_eq! (::std::mem::align_of::<ImageValue>() , 8usize ,
@@ -5269,7 +5297,7 @@ pub mod root {
                             "Alignment of " , stringify ! ( ImageValue ) ));
                 assert_eq! (unsafe {
                             & ( * ( 0 as * const ImageValue ) ) . mRequests as
-                            * const _ as usize } , 64usize , concat ! (
+                            * const _ as usize } , 48usize , concat ! (
                             "Alignment of field: " , stringify ! ( ImageValue
                             ) , "::" , stringify ! ( mRequests ) ));
             }
@@ -25827,6 +25855,7 @@ pub mod root {
     pub type RawGeckoElement = root::mozilla::dom::Element;
     pub type RawGeckoDocument = root::nsIDocument;
     pub type RawGeckoPresContext = root::nsPresContext;
+    pub type RawGeckoURLExtraData = root::mozilla::css::URLExtraData;
     pub type RawGeckoKeyframeList = root::nsTArray<root::mozilla::Keyframe>;
     pub type RawGeckoComputedKeyframeValuesList =
         root::nsTArray<root::nsTArray<root::mozilla::PropertyStyleAnimationValuePair>>;
@@ -26070,21 +26099,16 @@ pub mod root {
     impl Clone for nsMediaFeature {
         fn clone(&self) -> Self { *self }
     }
-    pub type ThreadSafePrincipalHolder =
-        root::nsMainThreadPtrHolder<root::nsIPrincipal>;
-    pub type ThreadSafeURIHolder = root::nsMainThreadPtrHolder<root::nsIURI>;
     #[repr(C)]
     #[derive(Debug, Copy)]
     pub struct ServoBundledURI {
         pub mURLString: *const u8,
         pub mURLStringLength: u32,
-        pub mBaseURI: *mut root::ThreadSafeURIHolder,
-        pub mReferrer: *mut root::ThreadSafeURIHolder,
-        pub mPrincipal: *mut root::ThreadSafePrincipalHolder,
+        pub mExtraData: *mut root::mozilla::css::URLExtraData,
     }
     #[test]
     fn bindgen_test_layout_ServoBundledURI() {
-        assert_eq!(::std::mem::size_of::<ServoBundledURI>() , 40usize , concat
+        assert_eq!(::std::mem::size_of::<ServoBundledURI>() , 24usize , concat
                    ! ( "Size of: " , stringify ! ( ServoBundledURI ) ));
         assert_eq! (::std::mem::align_of::<ServoBundledURI>() , 8usize ,
                     concat ! (
@@ -26101,59 +26125,15 @@ pub mod root {
                     "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
                     "::" , stringify ! ( mURLStringLength ) ));
         assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mBaseURI as *
+                    & ( * ( 0 as * const ServoBundledURI ) ) . mExtraData as *
                     const _ as usize } , 16usize , concat ! (
                     "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mBaseURI ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mReferrer as *
-                    const _ as usize } , 24usize , concat ! (
-                    "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mReferrer ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const ServoBundledURI ) ) . mPrincipal as *
-                    const _ as usize } , 32usize , concat ! (
-                    "Alignment of field: " , stringify ! ( ServoBundledURI ) ,
-                    "::" , stringify ! ( mPrincipal ) ));
+                    "::" , stringify ! ( mExtraData ) ));
     }
     impl Clone for ServoBundledURI {
         fn clone(&self) -> Self { *self }
     }
     #[repr(C)]
-    #[derive(Debug)]
-    pub struct GeckoParserExtraData {
-        pub mBaseURI: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIURI>>,
-        pub mReferrer: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIURI>>,
-        pub mPrincipal: root::RefPtr<root::nsMainThreadPtrHolder<root::nsIPrincipal>>,
-    }
-    #[test]
-    fn bindgen_test_layout_GeckoParserExtraData() {
-        assert_eq!(::std::mem::size_of::<GeckoParserExtraData>() , 24usize ,
-                   concat ! (
-                   "Size of: " , stringify ! ( GeckoParserExtraData ) ));
-        assert_eq! (::std::mem::align_of::<GeckoParserExtraData>() , 8usize ,
-                    concat ! (
-                    "Alignment of " , stringify ! ( GeckoParserExtraData ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mBaseURI
-                    as * const _ as usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mBaseURI )
-                    ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mReferrer
-                    as * const _ as usize } , 8usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mReferrer )
-                    ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const GeckoParserExtraData ) ) . mPrincipal
-                    as * const _ as usize } , 16usize , concat ! (
-                    "Alignment of field: " , stringify ! (
-                    GeckoParserExtraData ) , "::" , stringify ! ( mPrincipal )
-                    ));
-    }
-    #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct nsROCSSPrimitiveValue([u8; 0]);
     #[repr(C)]
@@ -27330,54 +27310,30 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_75() {
-        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
-                   , 24usize , concat ! (
-                   "Size of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
-        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
-                   , 8usize , concat ! (
-                   "Alignment of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_76() {
-        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>>()
+        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::css::URLExtraData>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>
-                   ) ));
-        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>>()
+                   root::already_AddRefed<root::mozilla::css::URLExtraData> )
+                   ));
+        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::mozilla::css::URLExtraData>>()
                    , 8usize , concat ! (
                    "Alignment of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIURI>>
-                   ) ));
+                   root::already_AddRefed<root::mozilla::css::URLExtraData> )
+                   ));
     }
     #[test]
-    fn __bindgen_test_layout_template_77() {
-        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIPrincipal>>()
+    fn __bindgen_test_layout_template_76() {
+        assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 24usize , concat ! (
                    "Size of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIPrincipal> ) ));
-        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIPrincipal>>()
-                   , 8usize , concat ! (
-                   "Alignment of template specialization: " , stringify ! (
-                   root::nsMainThreadPtrHolder<root::nsIPrincipal> ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_78() {
-        assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>>()
-                   , 8usize , concat ! (
-                   "Size of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>
-                   ) ));
-        assert_eq!(::std::mem::align_of::<root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>>()
+                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
+        assert_eq!(::std::mem::align_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 8usize , concat ! (
                    "Alignment of template specialization: " , stringify ! (
-                   root::already_AddRefed<root::nsMainThreadPtrHolder<root::nsIPrincipal>>
-                   ) ));
+                   root::nsMainThreadPtrHolder<root::nsIURI> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_79() {
+    fn __bindgen_test_layout_template_77() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValueList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27388,7 +27344,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsCSSValueList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_80() {
+    fn __bindgen_test_layout_template_78() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValueList,
                                                root::mozilla::DefaultDelete<root::nsCSSValueList>>>()
                    , 8usize , concat ! (
@@ -27405,7 +27361,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_81() {
+    fn __bindgen_test_layout_template_79() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValuePairList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27418,7 +27374,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_82() {
+    fn __bindgen_test_layout_template_80() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValuePairList,
                                                root::mozilla::DefaultDelete<root::nsCSSValuePairList>>>()
                    , 8usize , concat ! (
@@ -27435,7 +27391,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_83() {
+    fn __bindgen_test_layout_template_81() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FramePropertyTable_PropertyValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27448,7 +27404,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_84() {
+    fn __bindgen_test_layout_template_82() {
         assert_eq!(::std::mem::size_of::<root::nsPtrHashKey<root::nsIFrame>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27459,7 +27415,7 @@ pub mod root {
                    root::nsPtrHashKey<root::nsIFrame> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_85() {
+    fn __bindgen_test_layout_template_83() {
         assert_eq!(::std::mem::size_of::<[u64; 5usize]>() , 40usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27470,7 +27426,7 @@ pub mod root {
                    [u64; 5usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_86() {
+    fn __bindgen_test_layout_template_84() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::mozilla::EffectCompositor_AnimationStyleRuleProcessor>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27483,7 +27439,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_87() {
+    fn __bindgen_test_layout_template_85() {
         assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27494,7 +27450,7 @@ pub mod root {
                    [u64; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_88() {
+    fn __bindgen_test_layout_template_86() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -27503,7 +27459,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_89() {
+    fn __bindgen_test_layout_template_87() {
         assert_eq!(::std::mem::size_of::<[u32; 3usize]>() , 12usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27514,7 +27470,7 @@ pub mod root {
                    [u32; 3usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_90() {
+    fn __bindgen_test_layout_template_88() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsStyleImageRequest>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27525,7 +27481,7 @@ pub mod root {
                    root::already_AddRefed<root::nsStyleImageRequest> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_91() {
+    fn __bindgen_test_layout_template_89() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsStyleSides>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27536,7 +27492,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsStyleSides> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_92() {
+    fn __bindgen_test_layout_template_90() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsStyleSides,
                                                root::mozilla::DefaultDelete<root::nsStyleSides>>>()
                    , 8usize , concat ! (
@@ -27553,7 +27509,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_93() {
+    fn __bindgen_test_layout_template_91() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::CachedBorderImageData>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27566,7 +27522,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_94() {
+    fn __bindgen_test_layout_template_92() {
         assert_eq!(::std::mem::size_of::<root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr>>()
                    , 32usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27577,7 +27533,7 @@ pub mod root {
                    root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_95() {
+    fn __bindgen_test_layout_template_93() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::std::pair<::nsstring::nsStringRepr,
                                                      ::nsstring::nsStringRepr>>>()
                    , 8usize , concat ! (
@@ -27592,7 +27548,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_96() {
+    fn __bindgen_test_layout_template_94() {
         assert_eq!(::std::mem::size_of::<[u64; 18usize]>() , 144usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -27603,7 +27559,7 @@ pub mod root {
                    [u64; 18usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_97() {
+    fn __bindgen_test_layout_template_95() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::DisplayItemClip_RoundedRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27616,7 +27572,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_98() {
+    fn __bindgen_test_layout_template_96() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27627,7 +27583,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::DOMRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_99() {
+    fn __bindgen_test_layout_template_97() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -27636,7 +27592,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_100() {
+    fn __bindgen_test_layout_template_98() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27647,7 +27603,7 @@ pub mod root {
                    root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_101() {
+    fn __bindgen_test_layout_template_99() {
         assert_eq!(::std::mem::size_of::<root::nsAutoPtr<root::nsMediaQuery>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (