Auto merge of #13539 - Manishearth:regen, r=emilio

Regen bindings for upcoming resync

<s>The StyleComplexColor stuff has broken things, so the sync may take longer to fix.

cc @xidorn if you want to look into this. Otherwise I'll fix it monday.</s>

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13539)
<!-- Reviewable:end -->

6 files changed, 845 insertions, 800 deletions

diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
index f840d9117c3..d8b44c696c4 100644
--- a/components/style/gecko_bindings/structs_debug.rs
+++ b/components/style/gecko_bindings/structs_debug.rs
@@ -221,7 +221,6 @@ pub const NS_STYLE_VOLUME_SOFT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_VOLUME_MEDIUM: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_VOLUME_LOUD: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_VOLUME_X_LOUD: ::std::os::raw::c_uint = 5;
-pub const NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_COLOR_INHERIT_FROM_BODY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE: ::std::os::raw::c_uint
           =
@@ -795,9 +794,6 @@ pub const NS_STYLE_HAS_CHILD_THAT_USES_RESET_STYLE:
 pub const NS_STYLE_IS_TEXT_COMBINED: ::std::os::raw::c_ulonglong =
     34359738368;
 pub const NS_STYLE_CONTEXT_TYPE_SHIFT: ::std::os::raw::c_uint = 36;
-pub const BORDER_COLOR_FOREGROUND: ::std::os::raw::c_uint = 32;
-pub const BORDER_COLOR_SPECIAL: ::std::os::raw::c_uint = 160;
-pub const BORDER_STYLE_MASK: ::std::os::raw::c_uint = 31;
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct fallible_t {
@@ -1083,6 +1079,20 @@ pub enum nsresult {
     NS_ERROR_UNCATCHABLE_EXCEPTION = 2152924152,
     NS_ERROR_DOM_DOMEXCEPTION = 2152924153,
     NS_ERROR_DOM_EXCEPTION_ON_JSCONTEXT = 2152924154,
+    NS_ERROR_DOM_MALFORMED_URI = 2152924155,
+    NS_ERROR_DOM_INVALID_HEADER_NAME = 2152924156,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_INVALID_CONTEXT = 2152924157,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_BE_OPENED = 2152924158,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_SENDING = 2152924159,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_LOADING_OR_DONE = 2152924160,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_WRONG_RESPONSETYPE_FOR_RESPONSEXML =
+        2152924161,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_WRONG_RESPONSETYPE_FOR_RESPONSETEXT =
+        2152924162,
+    NS_ERROR_DOM_INVALID_STATE_XHR_CHUNKED_RESPONSETYPES_UNSUPPORTED_FOR_SYNC
+        = 2152924163,
+    NS_ERROR_DOM_INVALID_ACCESS_XHR_TIMEOUT_AND_RESPONSETYPE_UNSUPPORTED_FOR_SYNC
+        = 2152924164,
     NS_SUCCESS_DOM_NO_OPERATION = 5439489,
     NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW = 5439490,
     NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE = 5439491,
@@ -1307,6 +1317,7 @@ pub enum nsresult {
     NS_ERROR_DOM_MEDIA_MEDIASINK_ERR = 2154692619,
     NS_ERROR_DOM_MEDIA_DEMUXER_ERR = 2154692620,
     NS_ERROR_DOM_MEDIA_CDM_ERR = 2154692621,
+    NS_ERROR_DOM_MEDIA_CUBEB_INITIALIZATION_ERR = 2154692709,
     NS_ERROR_DOWNLOAD_COMPLETE = 2155347969,
     NS_ERROR_DOWNLOAD_NOT_PARTIAL = 2155347970,
     NS_ERROR_UNORM_MOREOUTPUT = 2155348001,
@@ -1501,8 +1512,8 @@ pub enum JSWhyMagic {
 #[derive(Debug, Copy)]
 pub struct jsval_layout {
     pub asBits: __BindgenUnionField<u64>,
-    pub debugView: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_61756>,
-    pub s: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_61763>,
+    pub debugView: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_61833>,
+    pub s: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_61840>,
     pub asDouble: __BindgenUnionField<f64>,
     pub asPtr: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub asWord: __BindgenUnionField<usize>,
@@ -1511,20 +1522,20 @@ pub struct jsval_layout {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_61756 {
+pub struct jsval_layout__bindgen_ty_bindgen_id_61833 {
     pub _bitfield_1: u64,
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61756() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61756>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61833() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61833>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61756>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61833>()
                , 8usize);
 }
-impl Clone for jsval_layout__bindgen_ty_bindgen_id_61756 {
+impl Clone for jsval_layout__bindgen_ty_bindgen_id_61833 {
     fn clone(&self) -> Self { *self }
 }
-impl jsval_layout__bindgen_ty_bindgen_id_61756 {
+impl jsval_layout__bindgen_ty_bindgen_id_61833 {
     #[inline]
     pub fn payload47(&self) -> u64 {
         unsafe {
@@ -1557,36 +1568,36 @@ impl jsval_layout__bindgen_ty_bindgen_id_61756 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_61763 {
-    pub payload: jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764,
+pub struct jsval_layout__bindgen_ty_bindgen_id_61840 {
+    pub payload: jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764 {
+pub struct jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841 {
     pub i32: __BindgenUnionField<i32>,
     pub u32: __BindgenUnionField<u32>,
     pub why: __BindgenUnionField<JSWhyMagic>,
     pub bindgen_union_field: u32,
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841>()
                , 4usize);
 }
 impl Clone for
- jsval_layout__bindgen_ty_bindgen_id_61763__bindgen_ty_bindgen_id_61764 {
+ jsval_layout__bindgen_ty_bindgen_id_61840__bindgen_ty_bindgen_id_61841 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61763() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61763>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_61840() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_61840>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61763>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_61840>()
                , 4usize);
 }
-impl Clone for jsval_layout__bindgen_ty_bindgen_id_61763 {
+impl Clone for jsval_layout__bindgen_ty_bindgen_id_61840 {
     fn clone(&self) -> Self { *self }
 }
 impl Clone for jsval_layout {
@@ -1620,7 +1631,7 @@ pub type nsAString_internal_size_type = u32;
 pub type nsAString_internal_index_type = u32;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsAString_internal__bindgen_ty_bindgen_id_63601 {
+pub enum nsAString_internal__bindgen_ty_bindgen_id_63710 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
@@ -1682,12 +1693,12 @@ fn bindgen_test_layout_nsString() {
     assert_eq!(::std::mem::align_of::<nsString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_64211 {
+pub struct bindgen_vtable__bindgen_id_64320 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_64211,
+    pub vtable_: *const bindgen_vtable__bindgen_id_64320,
 }
 pub type nsStringComparator_char_type = u16;
 #[test]
@@ -1729,7 +1740,7 @@ pub type nsACString_internal_size_type = u32;
 pub type nsACString_internal_index_type = u32;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsACString_internal__bindgen_ty_bindgen_id_65441 {
+pub enum nsACString_internal__bindgen_ty_bindgen_id_65550 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
@@ -1791,12 +1802,12 @@ fn bindgen_test_layout_nsCString() {
     assert_eq!(::std::mem::align_of::<nsCString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_65993 {
+pub struct bindgen_vtable__bindgen_id_66102 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_65993,
+    pub vtable_: *const bindgen_vtable__bindgen_id_66102,
 }
 pub type nsCStringComparator_char_type = ::std::os::raw::c_char;
 #[test]
@@ -1808,7 +1819,7 @@ impl Clone for nsCStringComparator {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_66037 {
+pub struct bindgen_vtable__bindgen_id_66146 {
 }
 /**
  * Basic component object model interface. Objects which implement
@@ -1819,7 +1830,7 @@ pub struct bindgen_vtable__bindgen_id_66037 {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsISupports {
-    pub vtable_: *const bindgen_vtable__bindgen_id_66037,
+    pub vtable_: *const bindgen_vtable__bindgen_id_66146,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -1837,7 +1848,7 @@ impl Clone for nsISupports {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_66320 {
+pub struct bindgen_vtable__bindgen_id_66429 {
 }
 /**
  * Participant implementation classes
@@ -1845,7 +1856,7 @@ pub struct bindgen_vtable__bindgen_id_66320 {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCycleCollectionParticipant {
-    pub vtable_: *const bindgen_vtable__bindgen_id_66320,
+    pub vtable_: *const bindgen_vtable__bindgen_id_66429,
     pub mMightSkip: bool,
 }
 #[test]
@@ -1898,6 +1909,7 @@ pub struct nsReadingIterator<CharT> {
 }
 pub type nsReadingIterator_self_type<CharT> = nsReadingIterator<CharT>;
 pub type nsReadingIterator_difference_type = isize;
+pub type nsReadingIterator_size_type = usize;
 pub type nsReadingIterator_value_type<CharT> = CharT;
 pub type nsReadingIterator_pointer<CharT> = *mut CharT;
 pub type nsReadingIterator_reference = [u8; 0usize];
@@ -1913,6 +1925,7 @@ pub struct nsWritingIterator<CharT> {
 }
 pub type nsWritingIterator_self_type<CharT> = nsWritingIterator<CharT>;
 pub type nsWritingIterator_difference_type = isize;
+pub type nsWritingIterator_size_type = usize;
 pub type nsWritingIterator_value_type<CharT> = CharT;
 pub type nsWritingIterator_pointer<CharT> = *mut CharT;
 pub type nsWritingIterator_reference = [u8; 0usize];
@@ -2154,7 +2167,7 @@ fn bindgen_test_layout_ErrorResult() {
 #[derive(Debug)]
 pub struct TErrorResult<CleanupPolicy> {
     pub mResult: nsresult,
-    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_73813<CleanupPolicy>,
+    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_73928<CleanupPolicy>,
     pub mMightHaveUnreportedJSException: bool,
     pub mUnionState: TErrorResult_UnionState,
     pub _mOwningThread: nsAutoOwningThread,
@@ -2184,7 +2197,7 @@ pub struct TErrorResult_DOMExceptionInfo<CleanupPolicy> {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct TErrorResult__bindgen_ty_bindgen_id_73813<CleanupPolicy> {
+pub struct TErrorResult__bindgen_ty_bindgen_id_73928<CleanupPolicy> {
     pub mMessage: __BindgenUnionField<*mut TErrorResult_Message<CleanupPolicy>>,
     pub mJSException: __BindgenUnionField<Value>,
     pub mDOMExceptionInfo: __BindgenUnionField<*mut TErrorResult_DOMExceptionInfo<CleanupPolicy>>,
@@ -2331,7 +2344,55 @@ impl nsIAtom {
     }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_74800 {
+#[derive(Debug, Copy)]
+pub struct nsIPrincipal {
+    pub _base: nsISerializable,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct nsIPrincipal_COMTypeInfo<T, U> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+    pub _phantom_1: ::std::marker::PhantomData<U>,
+}
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum nsIPrincipal__bindgen_ty_bindgen_id_75167 {
+    APP_STATUS_NOT_INSTALLED = 0,
+    APP_STATUS_INSTALLED = 1,
+    APP_STATUS_PRIVILEGED = 2,
+    APP_STATUS_CERTIFIED = 3,
+}
+#[test]
+fn bindgen_test_layout_nsIPrincipal() {
+    assert_eq!(::std::mem::size_of::<nsIPrincipal>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsIPrincipal>() , 8usize);
+}
+impl Clone for nsIPrincipal {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsISerializable {
+    pub _base: nsISupports,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct nsISerializable_COMTypeInfo<T, U> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+    pub _phantom_1: ::std::marker::PhantomData<U>,
+}
+#[test]
+fn bindgen_test_layout_nsISerializable() {
+    assert_eq!(::std::mem::size_of::<nsISerializable>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsISerializable>() , 8usize);
+}
+impl Clone for nsISerializable {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+pub struct bindgen_vtable__bindgen_id_75335 {
 }
 /**
  * Class to store the wrapper for an object. This can only be used with objects
@@ -2373,7 +2434,7 @@ pub struct bindgen_vtable__bindgen_id_74800 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsWrapperCache {
-    pub vtable_: *const bindgen_vtable__bindgen_id_74800,
+    pub vtable_: *const bindgen_vtable__bindgen_id_75335,
     pub mWrapper: *mut JSObject,
     pub mFlags: nsWrapperCache_FlagsType,
 }
@@ -2398,7 +2459,7 @@ pub type nsWrapperCache_FlagsType = u32;
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_75007 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_75542 {
     WRAPPER_BIT_PRESERVED = 1,
 }
 #[repr(u32)]
@@ -2407,12 +2468,12 @@ pub enum nsWrapperCache__bindgen_ty_bindgen_id_75007 {
    * binding.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_75010 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_75545 {
     WRAPPER_IS_NOT_DOM_BINDING = 2,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_75013 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_75548 {
     kWrapperFlagsMask = 3,
 }
 #[test]
@@ -2521,7 +2582,7 @@ impl Clone for random_access_iterator_tag {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_94642 {
+pub struct bindgen_vtable__bindgen_id_95272 {
 }
 /**
  * A class of objects that return source code on demand.
@@ -2537,7 +2598,7 @@ pub struct bindgen_vtable__bindgen_id_94642 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct SourceHook {
-    pub vtable_: *const bindgen_vtable__bindgen_id_94642,
+    pub vtable_: *const bindgen_vtable__bindgen_id_95272,
 }
 #[test]
 fn bindgen_test_layout_SourceHook() {
@@ -2545,54 +2606,6 @@ fn bindgen_test_layout_SourceHook() {
     assert_eq!(::std::mem::align_of::<SourceHook>() , 8usize);
 }
 #[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsIPrincipal {
-    pub _base: nsISerializable,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct nsIPrincipal_COMTypeInfo<T, U> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-    pub _phantom_1: ::std::marker::PhantomData<U>,
-}
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPrincipal__bindgen_ty_bindgen_id_100107 {
-    APP_STATUS_NOT_INSTALLED = 0,
-    APP_STATUS_INSTALLED = 1,
-    APP_STATUS_PRIVILEGED = 2,
-    APP_STATUS_CERTIFIED = 3,
-}
-#[test]
-fn bindgen_test_layout_nsIPrincipal() {
-    assert_eq!(::std::mem::size_of::<nsIPrincipal>() , 8usize);
-    assert_eq!(::std::mem::align_of::<nsIPrincipal>() , 8usize);
-}
-impl Clone for nsIPrincipal {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsISerializable {
-    pub _base: nsISupports,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct nsISerializable_COMTypeInfo<T, U> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-    pub _phantom_1: ::std::marker::PhantomData<U>,
-}
-#[test]
-fn bindgen_test_layout_nsISerializable() {
-    assert_eq!(::std::mem::size_of::<nsISerializable>() , 8usize);
-    assert_eq!(::std::mem::align_of::<nsISerializable>() , 8usize);
-}
-impl Clone for nsISerializable {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
 #[derive(Debug)]
 pub struct nsIGlobalObject {
     pub _base: nsISupports,
@@ -2669,6 +2682,7 @@ pub struct nsIDocument {
     pub mBlockAllMixedContentPreloads: bool,
     pub mUpgradeInsecureRequests: bool,
     pub mUpgradeInsecurePreloads: bool,
+    pub mHSTSPrimingURIList: [u64; 6usize],
     pub mDocumentContainer: u64,
     pub mCharacterSet: nsCString,
     pub mCharacterSetSource: i32,
@@ -2881,7 +2895,7 @@ pub type nsIDocument_FrameRequestCallbackList =
     nsTArray<RefPtr<FrameRequestCallback>>;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDocument__bindgen_ty_bindgen_id_108837 { REQUEST_DISCARD = 1, }
+pub enum nsIDocument__bindgen_ty_bindgen_id_108839 { REQUEST_DISCARD = 1, }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIDocument_DeprecatedOperations {
@@ -2908,22 +2922,23 @@ pub enum nsIDocument_DeprecatedOperations {
     eUseOfCaptureEvents = 20,
     eUseOfReleaseEvents = 21,
     eUseOfDOM3LoadMethod = 22,
-    eShowModalDialog = 23,
-    eWindow_Content = 24,
-    eSyncXMLHttpRequest = 25,
-    eDataContainerEvent = 26,
-    eWindow_Controllers = 27,
-    eImportXULIntoContent = 28,
-    ePannerNodeDoppler = 29,
-    eNavigatorGetUserMedia = 30,
-    eWebrtcDeprecatedPrefix = 31,
-    eRTCPeerConnectionGetStreams = 32,
-    eAppCache = 33,
-    ePrefixedImageSmoothingEnabled = 34,
-    ePrefixedFullscreenAPI = 35,
-    eLenientSetter = 36,
-    eFileLastModifiedDate = 37,
-    eDeprecatedOperationCount = 38,
+    eChromeUseOfDOM3LoadMethod = 23,
+    eShowModalDialog = 24,
+    eWindow_Content = 25,
+    eSyncXMLHttpRequest = 26,
+    eDataContainerEvent = 27,
+    eWindow_Controllers = 28,
+    eImportXULIntoContent = 29,
+    ePannerNodeDoppler = 30,
+    eNavigatorGetUserMedia = 31,
+    eWebrtcDeprecatedPrefix = 32,
+    eRTCPeerConnectionGetStreams = 33,
+    eAppCache = 34,
+    ePrefixedImageSmoothingEnabled = 35,
+    ePrefixedFullscreenAPI = 36,
+    eLenientSetter = 37,
+    eFileLastModifiedDate = 38,
+    eDeprecatedOperationCount = 39,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -2963,7 +2978,7 @@ impl Clone for nsIDocument_FrameRequest {
 }
 #[test]
 fn bindgen_test_layout_nsIDocument() {
-    assert_eq!(::std::mem::size_of::<nsIDocument>() , 912usize);
+    assert_eq!(::std::mem::size_of::<nsIDocument>() , 960usize);
     assert_eq!(::std::mem::align_of::<nsIDocument>() , 8usize);
 }
 impl nsIDocument {
@@ -3519,20 +3534,6 @@ impl nsIDocument {
             ((val as u8 as u64) << 41u32) & (2199023255552usize as u64);
     }
     #[inline]
-    pub fn mMayHavePluginFramesForPrinting(&self) -> bool {
-        unsafe {
-            ::std::mem::transmute(((self._bitfield_1 &
-                                        (4398046511104usize as u64)) >> 42u32)
-                                      as u8)
-        }
-    }
-    #[inline]
-    pub fn set_mMayHavePluginFramesForPrinting(&mut self, val: bool) {
-        self._bitfield_1 &= !(4398046511104usize as u64);
-        self._bitfield_1 |=
-            ((val as u8 as u64) << 42u32) & (4398046511104usize as u64);
-    }
-    #[inline]
     pub fn mDidFireDOMContentLoaded(&self) -> bool {
         unsafe {
             ::std::mem::transmute(((self._bitfield_2 & (1usize as u8)) >>
@@ -3572,7 +3573,7 @@ pub struct nsINode {
     pub mNextSibling: *mut nsIContent,
     pub mPreviousSibling: *mut nsIContent,
     pub mFirstChild: *mut nsIContent,
-    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_105526,
+    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_105742,
     pub mSlots: *mut nsINode_nsSlots,
     pub mServoData: ServoCell<*mut ServoNodeData>,
 }
@@ -3597,7 +3598,7 @@ pub struct nsINode_COMTypeInfo<T, U> {
    * Bit-flags to pass (or'ed together) to IsNodeOfType()
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsINode__bindgen_ty_bindgen_id_101651 {
+pub enum nsINode__bindgen_ty_bindgen_id_101867 {
     eCONTENT = 1,
     eDOCUMENT = 2,
     eATTRIBUTE = 4,
@@ -3612,12 +3613,12 @@ pub enum nsINode__bindgen_ty_bindgen_id_101651 {
     eFILTER = 2048,
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_102420 {
+pub struct bindgen_vtable__bindgen_id_102636 {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsINode_nsSlots {
-    pub vtable_: *const bindgen_vtable__bindgen_id_102420,
+    pub vtable_: *const bindgen_vtable__bindgen_id_102636,
     /**
      * A list of mutation observers
      */
@@ -3686,19 +3687,19 @@ pub enum nsINode_BooleanFlag {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsINode__bindgen_ty_bindgen_id_105526 {
+pub struct nsINode__bindgen_ty_bindgen_id_105742 {
     pub mPrimaryFrame: __BindgenUnionField<*mut nsIFrame>,
     pub mSubtreeRoot: __BindgenUnionField<*mut nsINode>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsINode__bindgen_ty_bindgen_id_105526() {
-    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_105526>()
+fn bindgen_test_layout_nsINode__bindgen_ty_bindgen_id_105742() {
+    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_105742>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_105526>()
+    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_105742>()
                , 8usize);
 }
-impl Clone for nsINode__bindgen_ty_bindgen_id_105526 {
+impl Clone for nsINode__bindgen_ty_bindgen_id_105742 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -3797,52 +3798,6 @@ pub enum SheetType {
     Unknown = 255,
 }
 /**
- * Smart pointer class that can hold a pointer to either a CSSStyleSheet
- * or a ServoStyleSheet.
- */
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct StyleSheetHandle {
-    pub mPtr: StyleSheetHandle_Ptr,
-}
-pub type StyleSheetHandle_RefPtr = HandleRefPtr<StyleSheetHandle>;
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct StyleSheetHandle_Ptr {
-    pub mValue: usize,
-}
-#[test]
-fn bindgen_test_layout_StyleSheetHandle_Ptr() {
-    assert_eq!(::std::mem::size_of::<StyleSheetHandle_Ptr>() , 8usize);
-    assert_eq!(::std::mem::align_of::<StyleSheetHandle_Ptr>() , 8usize);
-}
-impl Clone for StyleSheetHandle_Ptr {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_StyleSheetHandle() {
-    assert_eq!(::std::mem::size_of::<StyleSheetHandle>() , 8usize);
-    assert_eq!(::std::mem::align_of::<StyleSheetHandle>() , 8usize);
-}
-impl Clone for StyleSheetHandle {
-    fn clone(&self) -> Self { *self }
-}
-pub const ReferrerPolicy_RP_Default: ReferrerPolicy =
-    ReferrerPolicy::RP_No_Referrer_When_Downgrade;
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum ReferrerPolicy {
-    RP_No_Referrer = 1,
-    RP_Origin = 2,
-    RP_No_Referrer_When_Downgrade = 0,
-    RP_Origin_When_Crossorigin = 3,
-    RP_Unsafe_URL = 4,
-    RP_Same_Origin = 5,
-    RP_Strict_Origin = 6,
-    RP_Strict_Origin_When_Cross_Origin = 7,
-    RP_Unset = 4294967295,
-}
-/**
  * EventStates is the class used to represent the event states of nsIContent
  * instances. These states are calculated by IntrinsicState() and
  * ContentStatesChanged() has to be called when one of them changes thus
@@ -4051,7 +4006,7 @@ pub struct nsIDOMNode_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_113688 {
+pub enum nsIDOMNode__bindgen_ty_bindgen_id_113677 {
     ELEMENT_NODE = 1,
     ATTRIBUTE_NODE = 2,
     TEXT_NODE = 3,
@@ -4067,7 +4022,7 @@ pub enum nsIDOMNode__bindgen_ty_bindgen_id_113688 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_113907 {
+pub enum nsIDOMNode__bindgen_ty_bindgen_id_113896 {
     DOCUMENT_POSITION_DISCONNECTED = 1,
     DOCUMENT_POSITION_PRECEDING = 2,
     DOCUMENT_POSITION_FOLLOWING = 4,
@@ -4911,7 +4866,8 @@ pub enum nsChangeHint {
     nsChangeHint_UpdateComputedBSize = 16777216,
     nsChangeHint_UpdateUsesOpacity = 33554432,
     nsChangeHint_UpdateBackgroundPosition = 67108864,
-    nsChangeHint_AllHints = 134217727,
+    nsChangeHint_AddOrRemoveTransform = 134217728,
+    nsChangeHint_AllHints = 268435455,
 }
 pub type nscolor = u32;
 #[repr(u32)]
@@ -5188,7 +5144,7 @@ pub type nsPtrHashKey_KeyType<T> = *mut T;
 pub type nsPtrHashKey_KeyTypePointer<T> = *mut T;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPtrHashKey__bindgen_ty_bindgen_id_118431 { ALLOW_MEMMOVE = 0, }
+pub enum nsPtrHashKey__bindgen_ty_bindgen_id_118426 { ALLOW_MEMMOVE = 0, }
 /**
  * A node of content in a document's content model. This interface
  * is supported by all content objects.
@@ -5208,14 +5164,14 @@ pub struct nsIContent_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_119771 {
+pub enum nsIContent__bindgen_ty_bindgen_id_119766 {
     eAllChildren = 0,
     eAllButXBL = 1,
     eSkipPlaceholderContent = 2,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_120007 {
+pub enum nsIContent__bindgen_ty_bindgen_id_120002 {
     ATTR_MISSING = -1,
     ATTR_VALUE_NO_MATCH = -2,
 }
@@ -5421,7 +5377,7 @@ pub struct FragmentOrElement_nsDOMSlots {
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
-    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138,
+    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135,
     /**
      * An object implementing the .children property for this element.
      */
@@ -5458,7 +5414,7 @@ pub struct FragmentOrElement_nsDOMSlots {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138 {
+pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135 {
     /**
       * The nearest enclosing content node with a binding that created us.
       * @see FragmentOrElement::GetBindingParent
@@ -5471,13 +5427,13 @@ pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138 {
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138() {
-    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138>()
+fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135() {
+    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138>()
+    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135>()
                , 8usize);
 }
-impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121138 {
+impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_121135 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -5498,6 +5454,21 @@ fn bindgen_test_layout_FragmentOrElement() {
     assert_eq!(::std::mem::size_of::<FragmentOrElement>() , 128usize);
     assert_eq!(::std::mem::align_of::<FragmentOrElement>() , 8usize);
 }
+pub const ReferrerPolicy_RP_Default: ReferrerPolicy =
+    ReferrerPolicy::RP_No_Referrer_When_Downgrade;
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum ReferrerPolicy {
+    RP_No_Referrer = 1,
+    RP_Origin = 2,
+    RP_No_Referrer_When_Downgrade = 0,
+    RP_Origin_When_Crossorigin = 3,
+    RP_Unsafe_URL = 4,
+    RP_Same_Origin = 5,
+    RP_Strict_Origin = 6,
+    RP_Strict_Origin_When_Cross_Origin = 7,
+    RP_Unset = 4294967295,
+}
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsIWeakReference {
@@ -5549,7 +5520,7 @@ pub struct nsIChannel_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_138649 {
+pub enum nsIChannel__bindgen_ty_bindgen_id_138644 {
     LOAD_DOCUMENT_URI = 65536,
     LOAD_RETARGETED_DOCUMENT_URI = 131072,
     LOAD_REPLACE = 262144,
@@ -5563,7 +5534,7 @@ pub enum nsIChannel__bindgen_ty_bindgen_id_138649 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_138669 {
+pub enum nsIChannel__bindgen_ty_bindgen_id_138664 {
     DISPOSITION_INLINE = 0,
     DISPOSITION_ATTACHMENT = 1,
 }
@@ -5589,7 +5560,7 @@ pub struct nsIRequest_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIRequest__bindgen_ty_bindgen_id_138487 {
+pub enum nsIRequest__bindgen_ty_bindgen_id_138482 {
     LOAD_REQUESTMASK = 65535,
     LOAD_NORMAL = 0,
     LOAD_BACKGROUND = 1,
@@ -5717,16 +5688,24 @@ pub enum SheetParsingMode {
     eAgentSheetFeatures = 2,
 }
 /**
- * A class for holding strong references to handle-managed objects.
- *
- * This is intended for use with objects like StyleSheetHandle, where
- * the handle type is not a pointer but which can still have ->AddRef()
- * and ->Release() called on it.
+ * Superclass for data common to CSSStyleSheet and ServoStyleSheet.
  */
 #[repr(C)]
-#[derive(Debug)]
-pub struct HandleRefPtr<T> {
-    pub mHandle: T,
+#[derive(Debug, Copy)]
+pub struct StyleSheet {
+    pub mDocument: *mut nsIDocument,
+    pub mOwningNode: *mut nsINode,
+    pub mParsingMode: SheetParsingMode,
+    pub mType: StyleBackendType,
+    pub mDisabled: bool,
+}
+#[test]
+fn bindgen_test_layout_StyleSheet() {
+    assert_eq!(::std::mem::size_of::<StyleSheet>() , 32usize);
+    assert_eq!(::std::mem::align_of::<StyleSheet>() , 8usize);
+}
+impl Clone for StyleSheet {
+    fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -6144,13 +6123,13 @@ pub enum nsIPresShell_ReflowRootHandling {
     eNoPositionOrSizeChange = 1,
     eInferFromBitToAdd = 2,
 }
-pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_156518 =
-    nsIPresShell__bindgen_ty_bindgen_id_156518::SCROLL_TOP;
-pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_156518 =
-    nsIPresShell__bindgen_ty_bindgen_id_156518::SCROLL_BOTTOM;
+pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_156907 =
+    nsIPresShell__bindgen_ty_bindgen_id_156907::SCROLL_TOP;
+pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_156907 =
+    nsIPresShell__bindgen_ty_bindgen_id_156907::SCROLL_BOTTOM;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_156518 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_156907 {
     SCROLL_TOP = 0,
     SCROLL_BOTTOM = 100,
     SCROLL_CENTER = 50,
@@ -6178,7 +6157,7 @@ impl Clone for nsIPresShell_ScrollAxis {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_156549 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_156938 {
     SCROLL_FIRST_ANCESTOR_ONLY = 1,
     SCROLL_OVERFLOW_HIDDEN = 2,
     SCROLL_NO_PARENT_FRAMES = 4,
@@ -6225,7 +6204,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_156549 {
    * transform.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_157002 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_157393 {
     RENDER_IS_UNTRUSTED = 1,
     RENDER_IGNORE_VIEWPORT_SCROLLING = 2,
     RENDER_CARET = 4,
@@ -6236,7 +6215,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_157002 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_157020 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_157411 {
     RENDER_IS_IMAGE = 256,
     RENDER_AUTO_SCALE = 128,
 }
@@ -6249,7 +6228,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_157020 {
    * transparent by default.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_157143 { FORCE_DRAW = 1, }
+pub enum nsIPresShell__bindgen_ty_bindgen_id_157534 { FORCE_DRAW = 1, }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIPresShell_PointerCaptureInfo {
@@ -6636,67 +6615,67 @@ pub struct DOMPointInit {
 impl Clone for DOMPointInit {
     fn clone(&self) -> Self { *self }
 }
-pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_LISTENERMANAGER;
-pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_PROPERTIES;
-pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_ANONYMOUS_ROOT;
-pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
-pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_NATIVE_ANONYMOUS_ROOT;
-pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_FORCE_XBL_BINDINGS;
-pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_MAY_BE_IN_BINDING_MNGR;
-pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_EDITABLE;
-pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_MAY_HAVE_CLASS;
-pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_IN_SHADOW_TREE;
-pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_EMPTY_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_SLOW_SELECTOR;
-pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_EDGE_CHILD_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_158564
+pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_LISTENERMANAGER;
+pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_PROPERTIES;
+pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_ANONYMOUS_ROOT;
+pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
+pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_NATIVE_ANONYMOUS_ROOT;
+pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_FORCE_XBL_BINDINGS;
+pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_MAY_BE_IN_BINDING_MNGR;
+pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_EDITABLE;
+pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_MAY_HAVE_CLASS;
+pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_IN_SHADOW_TREE;
+pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_EMPTY_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_SLOW_SELECTOR;
+pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_EDGE_CHILD_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_158955
           =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
-pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_ALL_SELECTOR_FLAGS;
-pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_NEEDS_FRAME;
-pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_DESCENDANTS_NEED_FRAMES;
-pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_ACCESSKEY;
-pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_DIRECTION_RTL;
-pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_HAS_DIRECTION_LTR;
-pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_ALL_DIRECTION_FLAGS;
-pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_CHROME_ONLY_ACCESS;
-pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
-pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_158564
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
+pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_ALL_SELECTOR_FLAGS;
+pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_NEEDS_FRAME;
+pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_DESCENDANTS_NEED_FRAMES;
+pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_ACCESSKEY;
+pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_DIRECTION_RTL;
+pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_HAS_DIRECTION_LTR;
+pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_ALL_DIRECTION_FLAGS;
+pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_CHROME_ONLY_ACCESS;
+pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
+pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_158955
           =
-    _bindgen_ty_bindgen_id_158564::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_158564 =
-    _bindgen_ty_bindgen_id_158564::NODE_TYPE_SPECIFIC_BITS_OFFSET;
+    _bindgen_ty_bindgen_id_158955::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_158955 =
+    _bindgen_ty_bindgen_id_158955::NODE_TYPE_SPECIFIC_BITS_OFFSET;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum _bindgen_ty_bindgen_id_158564 {
+pub enum _bindgen_ty_bindgen_id_158955 {
     NODE_HAS_LISTENERMANAGER = 4,
     NODE_HAS_PROPERTIES = 8,
     NODE_IS_ANONYMOUS_ROOT = 16,
@@ -6754,7 +6733,7 @@ pub struct nsITimer_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsITimer__bindgen_ty_bindgen_id_175132 {
+pub enum nsITimer__bindgen_ty_bindgen_id_175571 {
     TYPE_ONE_SHOT = 0,
     TYPE_REPEATING_SLACK = 1,
     TYPE_REPEATING_PRECISE = 2,
@@ -6780,7 +6759,7 @@ pub struct nsExpirationState {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsExpirationState__bindgen_ty_bindgen_id_175608 {
+pub enum nsExpirationState__bindgen_ty_bindgen_id_176047 {
     NOT_TRACKED = 15,
     MAX_INDEX_IN_GENERATION = 268435455,
 }
@@ -6854,7 +6833,7 @@ pub struct imgIRequest_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_176195 {
+pub enum imgIRequest__bindgen_ty_bindgen_id_176631 {
     STATUS_NONE = 0,
     STATUS_SIZE_AVAILABLE = 1,
     STATUS_LOAD_COMPLETE = 2,
@@ -6866,7 +6845,7 @@ pub enum imgIRequest__bindgen_ty_bindgen_id_176195 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_176275 {
+pub enum imgIRequest__bindgen_ty_bindgen_id_176711 {
     CORS_NONE = 1,
     CORS_ANONYMOUS = 2,
     CORS_USE_CREDENTIALS = 3,
@@ -7365,7 +7344,7 @@ pub type nsPresArena_FreeList_KeyType = u32;
 pub type nsPresArena_FreeList_KeyTypePointer = *const ::std::os::raw::c_void;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_196747 {
+pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_197183 {
     ALLOW_MEMMOVE = 0,
 }
 #[test]
@@ -7392,7 +7371,7 @@ pub struct imgINotificationObserver_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgINotificationObserver__bindgen_ty_bindgen_id_196894 {
+pub enum imgINotificationObserver__bindgen_ty_bindgen_id_197330 {
     SIZE_AVAILABLE = 1,
     FRAME_UPDATE = 2,
     FRAME_COMPLETE = 3,
@@ -7641,7 +7620,7 @@ pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_198148
+pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_198584
          {
     ALLOW_MEMMOVE = 1,
 }
@@ -8037,23 +8016,23 @@ pub enum nsStyleUnit {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_bindgen_id_198901 {
+pub struct _bindgen_ty_bindgen_id_199331 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mPointer: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout__bindgen_ty_bindgen_id_198901() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_198901>() ,
+fn bindgen_test_layout__bindgen_ty_bindgen_id_199331() {
+    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_199331>() ,
                8usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_198901>() ,
+    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_199331>() ,
                8usize);
 }
-impl Clone for _bindgen_ty_bindgen_id_198901 {
+impl Clone for _bindgen_ty_bindgen_id_199331 {
     fn clone(&self) -> Self { *self }
 }
-pub type nsStyleUnion = _bindgen_ty_bindgen_id_198901;
+pub type nsStyleUnion = _bindgen_ty_bindgen_id_199331;
 /**
  * Class that hold a single size specification used by the style
  * system.  The size specification consists of two parts -- a number
@@ -8245,6 +8224,18 @@ fn bindgen_test_layout_nsStyleDisplay() {
     assert_eq!(::std::mem::size_of::<nsStyleDisplay>() , 424usize);
     assert_eq!(::std::mem::align_of::<nsStyleDisplay>() , 8usize);
 }
+/**
+ * A class for holding strong references to handle-managed objects.
+ *
+ * This is intended for use with objects like RestyleManagerHandle,
+ * where the handle type is not a pointer but which can still have
+ * ->AddRef() and ->Release() called on it.
+ */
+#[repr(C)]
+#[derive(Debug)]
+pub struct HandleRefPtr<T> {
+    pub mHandle: T,
+}
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsILanguageAtomService {
@@ -9099,7 +9090,7 @@ fn bindgen_test_layout_imgRequestProxy() {
     assert_eq!(::std::mem::align_of::<imgRequestProxy>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_207997 {
+pub struct bindgen_vtable__bindgen_id_208430 {
 }
 /**
  * An interface for observing changes to image state, as reported by
@@ -9116,7 +9107,7 @@ pub struct bindgen_vtable__bindgen_id_207997 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct IProgressObserver {
-    pub vtable_: *const bindgen_vtable__bindgen_id_207997,
+    pub vtable_: *const bindgen_vtable__bindgen_id_208430,
     pub _base: u64,
 }
 #[test]
@@ -9138,7 +9129,7 @@ pub struct nsISupportsPriority_COMTypeInfo<T, U> {
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsISupportsPriority__bindgen_ty_bindgen_id_208078 {
+pub enum nsISupportsPriority__bindgen_ty_bindgen_id_208511 {
     PRIORITY_HIGHEST = -20,
     PRIORITY_HIGH = -10,
     PRIORITY_NORMAL = 0,
@@ -9573,7 +9564,7 @@ fn bindgen_test_layout_nsCSSValueFloatColor() {
 #[derive(Debug)]
 pub struct nsCSSValue {
     pub mUnit: nsCSSUnit,
-    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_211073,
+    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_211506,
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -9589,7 +9580,7 @@ fn bindgen_test_layout_nsCSSValue_Array() {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsCSSValue__bindgen_ty_bindgen_id_211073 {
+pub struct nsCSSValue__bindgen_ty_bindgen_id_211506 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mString: __BindgenUnionField<*mut nsStringBuffer>,
@@ -9614,13 +9605,13 @@ pub struct nsCSSValue__bindgen_ty_bindgen_id_211073 {
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_211073() {
-    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_211073>()
+fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_211506() {
+    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_211506>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_211073>()
+    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_211506>()
                , 8usize);
 }
-impl Clone for nsCSSValue__bindgen_ty_bindgen_id_211073 {
+impl Clone for nsCSSValue__bindgen_ty_bindgen_id_211506 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -9641,12 +9632,12 @@ fn bindgen_test_layout_nsCSSValueGradientStop() {
     assert_eq!(::std::mem::align_of::<nsCSSValueGradientStop>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_211281 {
+pub struct bindgen_vtable__bindgen_id_211714 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct CounterStyle {
-    pub vtable_: *const bindgen_vtable__bindgen_id_211281,
+    pub vtable_: *const bindgen_vtable__bindgen_id_211714,
     pub mStyle: i32,
 }
 #[test]
@@ -9846,26 +9837,26 @@ pub struct nsStyleImage {
     pub mCachedBIData: UniquePtr<CachedBorderImageData,
                                  DefaultDelete<CachedBorderImageData>>,
     pub mType: nsStyleImageType,
-    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_213249,
+    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_213682,
     pub mCropRect: UniquePtr<nsStyleSides, DefaultDelete<nsStyleSides>>,
     pub mImageTracked: bool,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleImage__bindgen_ty_bindgen_id_213249 {
+pub struct nsStyleImage__bindgen_ty_bindgen_id_213682 {
     pub mImage: __BindgenUnionField<*mut imgRequestProxy>,
     pub mGradient: __BindgenUnionField<*mut nsStyleGradient>,
     pub mElementId: __BindgenUnionField<*mut u16>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleImage__bindgen_ty_bindgen_id_213249() {
-    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_213249>()
+fn bindgen_test_layout_nsStyleImage__bindgen_ty_bindgen_id_213682() {
+    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_213682>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_213249>()
+    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_213682>()
                , 8usize);
 }
-impl Clone for nsStyleImage__bindgen_ty_bindgen_id_213249 {
+impl Clone for nsStyleImage__bindgen_ty_bindgen_id_213682 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -9916,7 +9907,7 @@ pub struct nsStyleImageLayers {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_213304 {
+pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_213737 {
     shorthand = 0,
     color = 1,
     image = 2,
@@ -10106,15 +10097,51 @@ pub struct nsStyleBorder {
     pub mBorderImageRepeatV: u8,
     pub mFloatEdge: StyleFloatEdge,
     pub mBoxDecorationBreak: StyleBoxDecorationBreak,
+    pub mBorderStyle: [u8; 4usize],
+    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_bindgen_id_214411,
     pub mComputedBorder: nsMargin,
     pub mBorder: nsMargin,
-    pub mBorderStyle: [u8; 4usize],
-    pub mBorderColor: [nscolor; 4usize],
     pub mTwipsPerPixel: nscoord,
 }
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleBorder__bindgen_ty_bindgen_id_214411 {
+    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412>,
+    pub mBorderColor: __BindgenUnionField<[StyleComplexColor; 4usize]>,
+    pub bindgen_union_field: [u32; 8usize],
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412 {
+    pub mBorderTopColor: StyleComplexColor,
+    pub mBorderRightColor: StyleComplexColor,
+    pub mBorderBottomColor: StyleComplexColor,
+    pub mBorderLeftColor: StyleComplexColor,
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412>()
+               , 32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412>()
+               , 4usize);
+}
+impl Clone for
+ nsStyleBorder__bindgen_ty_bindgen_id_214411__bindgen_ty_bindgen_id_214412 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_214411() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_214411>()
+               , 32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_214411>()
+               , 4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_bindgen_id_214411 {
+    fn clone(&self) -> Self { *self }
+}
 #[test]
 fn bindgen_test_layout_nsStyleBorder() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 304usize);
+    assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 320usize);
     assert_eq!(::std::mem::align_of::<nsStyleBorder>() , 8usize);
 }
 #[repr(C)]
@@ -10123,9 +10150,9 @@ pub struct nsStyleOutline {
     pub mOutlineRadius: nsStyleCorners,
     pub mOutlineWidth: nsStyleCoord,
     pub mOutlineOffset: nscoord,
-    pub mActualOutlineWidth: nscoord,
-    pub mOutlineColor: nscolor,
+    pub mOutlineColor: StyleComplexColor,
     pub mOutlineStyle: u8,
+    pub mActualOutlineWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
 #[test]
@@ -10311,11 +10338,11 @@ fn bindgen_test_layout_nsStyleTextOverflow() {
 pub struct nsStyleTextReset {
     pub mTextOverflow: nsStyleTextOverflow,
     pub mTextDecorationLine: u8,
+    pub mTextDecorationStyle: u8,
     pub mUnicodeBidi: u8,
     pub mInitialLetterSink: nscoord,
     pub mInitialLetterSize: f32,
-    pub mTextDecorationStyle: u8,
-    pub mTextDecorationColor: nscolor,
+    pub mTextDecorationColor: StyleComplexColor,
 }
 #[test]
 fn bindgen_test_layout_nsStyleTextReset() {
@@ -10416,7 +10443,7 @@ impl Clone for nsStyleImageOrientation {
 #[derive(Debug, Copy)]
 pub struct nsTimingFunction {
     pub mType: nsTimingFunction_Type,
-    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_215057,
+    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_215389,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -10435,56 +10462,56 @@ pub enum nsTimingFunction_Type {
 pub enum nsTimingFunction_Keyword { Implicit = 0, Explicit = 1, }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_215057 {
-    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058>,
-    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069>,
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_215389 {
+    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390>,
+    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401>,
     pub bindgen_union_field: [u32; 4usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058 {
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390 {
     pub mX1: f32,
     pub mY1: f32,
     pub mX2: f32,
     pub mY2: f32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390>()
                , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390>()
                , 4usize);
 }
 impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215058
+ nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215390
  {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069 {
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401 {
     pub mSteps: u32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401>()
                , 4usize);
 }
 impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_215057__bindgen_ty_bindgen_id_215069
+ nsTimingFunction__bindgen_ty_bindgen_id_215389__bindgen_ty_bindgen_id_215401
  {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215057() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_215389() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389>()
                , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215057>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_215389>()
                , 4usize);
 }
-impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_215057 {
+impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_215389 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10545,13 +10572,13 @@ fn bindgen_test_layout_StyleBasicShape() {
 #[repr(C)]
 #[derive(Debug)]
 pub struct StyleShapeSource<ReferenceBox> {
-    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_215440<ReferenceBox>,
+    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_215772<ReferenceBox>,
     pub mType: StyleShapeSourceType,
     pub mReferenceBox: ReferenceBox,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct StyleShapeSource__bindgen_ty_bindgen_id_215440<ReferenceBox> {
+pub struct StyleShapeSource__bindgen_ty_bindgen_id_215772<ReferenceBox> {
     pub mBasicShape: __BindgenUnionField<*mut StyleBasicShape>,
     pub mURL: __BindgenUnionField<*mut FragmentOrURL>,
     pub bindgen_union_field: u64,
@@ -10603,25 +10630,25 @@ pub enum nsStyleContentType {
 #[derive(Debug)]
 pub struct nsStyleContentData {
     pub mType: nsStyleContentType,
-    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_215524,
+    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_215856,
     pub mImageTracked: bool,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleContentData__bindgen_ty_bindgen_id_215524 {
+pub struct nsStyleContentData__bindgen_ty_bindgen_id_215856 {
     pub mString: __BindgenUnionField<*mut u16>,
     pub mImage: __BindgenUnionField<*mut imgRequestProxy>,
     pub mCounters: __BindgenUnionField<*mut nsCSSValue_Array>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleContentData__bindgen_ty_bindgen_id_215524() {
-    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_215524>()
+fn bindgen_test_layout_nsStyleContentData__bindgen_ty_bindgen_id_215856() {
+    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_215856>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_215524>()
+    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_215856>()
                , 8usize);
 }
-impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_215524 {
+impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_215856 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10688,12 +10715,11 @@ pub struct nsStyleUserInterface {
     pub mUserFocus: StyleUserFocus,
     pub mPointerEvents: u8,
     pub mCursor: u8,
-    pub mCursorArrayLength: u32,
-    pub mCursorArray: *mut nsCursorImage,
+    pub mCursorImages: nsTArray<nsCursorImage>,
 }
 #[test]
 fn bindgen_test_layout_nsStyleUserInterface() {
-    assert_eq!(::std::mem::size_of::<nsStyleUserInterface>() , 24usize);
+    assert_eq!(::std::mem::size_of::<nsStyleUserInterface>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsStyleUserInterface>() , 8usize);
 }
 #[repr(C)]
@@ -10718,10 +10744,9 @@ pub struct nsStyleColumn {
     pub mColumnCount: u32,
     pub mColumnWidth: nsStyleCoord,
     pub mColumnGap: nsStyleCoord,
-    pub mColumnRuleColor: nscolor,
+    pub mColumnRuleColor: StyleComplexColor,
     pub mColumnRuleStyle: u8,
     pub mColumnFill: u8,
-    pub mColumnRuleColorIsForeground: bool,
     pub mColumnRuleWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
@@ -10731,7 +10756,7 @@ extern "C" {
 }
 #[test]
 fn bindgen_test_layout_nsStyleColumn() {
-    assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 56usize);
+    assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 64usize);
     assert_eq!(::std::mem::align_of::<nsStyleColumn>() , 8usize);
 }
 #[repr(u32)]
@@ -10746,25 +10771,25 @@ pub enum nsStyleSVGPaintType {
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleSVGPaint {
-    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_215923,
+    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_216243,
     pub mType: nsStyleSVGPaintType,
     pub mFallbackColor: nscolor,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_215923 {
+pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_216243 {
     pub mColor: __BindgenUnionField<nscolor>,
     pub mPaintServer: __BindgenUnionField<*mut FragmentOrURL>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_215923() {
-    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_215923>()
+fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_216243() {
+    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_216243>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_215923>()
+    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_216243>()
                , 8usize);
 }
-impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_215923 {
+impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_216243 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10799,7 +10824,7 @@ pub struct nsStyleSVG {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleSVG__bindgen_ty_bindgen_id_216100 {
+pub enum nsStyleSVG__bindgen_ty_bindgen_id_216420 {
     FILL_OPACITY_SOURCE_MASK = 3,
     STROKE_OPACITY_SOURCE_MASK = 12,
     STROKE_DASHARRAY_CONTEXT = 16,
@@ -10818,23 +10843,23 @@ fn bindgen_test_layout_nsStyleSVG() {
 pub struct nsStyleFilter {
     pub mType: i32,
     pub mFilterParameter: nsStyleCoord,
-    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_216166,
+    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_216486,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleFilter__bindgen_ty_bindgen_id_216166 {
+pub struct nsStyleFilter__bindgen_ty_bindgen_id_216486 {
     pub mURL: __BindgenUnionField<*mut FragmentOrURL>,
     pub mDropShadow: __BindgenUnionField<*mut nsCSSShadowArray>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_216166() {
-    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_216166>()
+fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_216486() {
+    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_216486>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_216166>()
+    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_216486>()
                , 8usize);
 }
-impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_216166 {
+impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_216486 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
index 9a22e10419f..d52856aa9d9 100644
--- a/components/style/gecko_bindings/structs_release.rs
+++ b/components/style/gecko_bindings/structs_release.rs
@@ -221,7 +221,6 @@ pub const NS_STYLE_VOLUME_SOFT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_VOLUME_MEDIUM: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_VOLUME_LOUD: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_VOLUME_X_LOUD: ::std::os::raw::c_uint = 5;
-pub const NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_COLOR_INHERIT_FROM_BODY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE: ::std::os::raw::c_uint
           =
@@ -795,9 +794,6 @@ pub const NS_STYLE_HAS_CHILD_THAT_USES_RESET_STYLE:
 pub const NS_STYLE_IS_TEXT_COMBINED: ::std::os::raw::c_ulonglong =
     34359738368;
 pub const NS_STYLE_CONTEXT_TYPE_SHIFT: ::std::os::raw::c_uint = 36;
-pub const BORDER_COLOR_FOREGROUND: ::std::os::raw::c_uint = 32;
-pub const BORDER_COLOR_SPECIAL: ::std::os::raw::c_uint = 160;
-pub const BORDER_STYLE_MASK: ::std::os::raw::c_uint = 31;
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct fallible_t {
@@ -1083,6 +1079,20 @@ pub enum nsresult {
     NS_ERROR_UNCATCHABLE_EXCEPTION = 2152924152,
     NS_ERROR_DOM_DOMEXCEPTION = 2152924153,
     NS_ERROR_DOM_EXCEPTION_ON_JSCONTEXT = 2152924154,
+    NS_ERROR_DOM_MALFORMED_URI = 2152924155,
+    NS_ERROR_DOM_INVALID_HEADER_NAME = 2152924156,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_INVALID_CONTEXT = 2152924157,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_BE_OPENED = 2152924158,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_SENDING = 2152924159,
+    NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_LOADING_OR_DONE = 2152924160,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_WRONG_RESPONSETYPE_FOR_RESPONSEXML =
+        2152924161,
+    NS_ERROR_DOM_INVALID_STATE_XHR_HAS_WRONG_RESPONSETYPE_FOR_RESPONSETEXT =
+        2152924162,
+    NS_ERROR_DOM_INVALID_STATE_XHR_CHUNKED_RESPONSETYPES_UNSUPPORTED_FOR_SYNC
+        = 2152924163,
+    NS_ERROR_DOM_INVALID_ACCESS_XHR_TIMEOUT_AND_RESPONSETYPE_UNSUPPORTED_FOR_SYNC
+        = 2152924164,
     NS_SUCCESS_DOM_NO_OPERATION = 5439489,
     NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW = 5439490,
     NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE = 5439491,
@@ -1307,6 +1317,7 @@ pub enum nsresult {
     NS_ERROR_DOM_MEDIA_MEDIASINK_ERR = 2154692619,
     NS_ERROR_DOM_MEDIA_DEMUXER_ERR = 2154692620,
     NS_ERROR_DOM_MEDIA_CDM_ERR = 2154692621,
+    NS_ERROR_DOM_MEDIA_CUBEB_INITIALIZATION_ERR = 2154692709,
     NS_ERROR_DOWNLOAD_COMPLETE = 2155347969,
     NS_ERROR_DOWNLOAD_NOT_PARTIAL = 2155347970,
     NS_ERROR_UNORM_MOREOUTPUT = 2155348001,
@@ -1501,8 +1512,8 @@ pub enum JSWhyMagic {
 #[derive(Debug, Copy)]
 pub struct jsval_layout {
     pub asBits: __BindgenUnionField<u64>,
-    pub debugView: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_59614>,
-    pub s: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_59621>,
+    pub debugView: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_59694>,
+    pub s: __BindgenUnionField<jsval_layout__bindgen_ty_bindgen_id_59701>,
     pub asDouble: __BindgenUnionField<f64>,
     pub asPtr: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub asWord: __BindgenUnionField<usize>,
@@ -1511,20 +1522,20 @@ pub struct jsval_layout {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_59614 {
+pub struct jsval_layout__bindgen_ty_bindgen_id_59694 {
     pub _bitfield_1: u64,
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59614() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59614>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59694() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59694>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59614>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59694>()
                , 8usize);
 }
-impl Clone for jsval_layout__bindgen_ty_bindgen_id_59614 {
+impl Clone for jsval_layout__bindgen_ty_bindgen_id_59694 {
     fn clone(&self) -> Self { *self }
 }
-impl jsval_layout__bindgen_ty_bindgen_id_59614 {
+impl jsval_layout__bindgen_ty_bindgen_id_59694 {
     #[inline]
     pub fn payload47(&self) -> u64 {
         unsafe {
@@ -1557,36 +1568,36 @@ impl jsval_layout__bindgen_ty_bindgen_id_59614 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_59621 {
-    pub payload: jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622,
+pub struct jsval_layout__bindgen_ty_bindgen_id_59701 {
+    pub payload: jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622 {
+pub struct jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702 {
     pub i32: __BindgenUnionField<i32>,
     pub u32: __BindgenUnionField<u32>,
     pub why: __BindgenUnionField<JSWhyMagic>,
     pub bindgen_union_field: u32,
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702>()
                , 4usize);
 }
 impl Clone for
- jsval_layout__bindgen_ty_bindgen_id_59621__bindgen_ty_bindgen_id_59622 {
+ jsval_layout__bindgen_ty_bindgen_id_59701__bindgen_ty_bindgen_id_59702 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59621() {
-    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59621>()
+fn bindgen_test_layout_jsval_layout__bindgen_ty_bindgen_id_59701() {
+    assert_eq!(::std::mem::size_of::<jsval_layout__bindgen_ty_bindgen_id_59701>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59621>()
+    assert_eq!(::std::mem::align_of::<jsval_layout__bindgen_ty_bindgen_id_59701>()
                , 4usize);
 }
-impl Clone for jsval_layout__bindgen_ty_bindgen_id_59621 {
+impl Clone for jsval_layout__bindgen_ty_bindgen_id_59701 {
     fn clone(&self) -> Self { *self }
 }
 impl Clone for jsval_layout {
@@ -1620,7 +1631,7 @@ pub type nsAString_internal_size_type = u32;
 pub type nsAString_internal_index_type = u32;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsAString_internal__bindgen_ty_bindgen_id_61459 {
+pub enum nsAString_internal__bindgen_ty_bindgen_id_61571 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
@@ -1682,12 +1693,12 @@ fn bindgen_test_layout_nsString() {
     assert_eq!(::std::mem::align_of::<nsString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_62069 {
+pub struct bindgen_vtable__bindgen_id_62181 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_62069,
+    pub vtable_: *const bindgen_vtable__bindgen_id_62181,
 }
 pub type nsStringComparator_char_type = u16;
 #[test]
@@ -1729,7 +1740,7 @@ pub type nsACString_internal_size_type = u32;
 pub type nsACString_internal_index_type = u32;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsACString_internal__bindgen_ty_bindgen_id_63299 {
+pub enum nsACString_internal__bindgen_ty_bindgen_id_63411 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
@@ -1791,12 +1802,12 @@ fn bindgen_test_layout_nsCString() {
     assert_eq!(::std::mem::align_of::<nsCString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_63851 {
+pub struct bindgen_vtable__bindgen_id_63963 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_63851,
+    pub vtable_: *const bindgen_vtable__bindgen_id_63963,
 }
 pub type nsCStringComparator_char_type = ::std::os::raw::c_char;
 #[test]
@@ -1808,7 +1819,7 @@ impl Clone for nsCStringComparator {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_63895 {
+pub struct bindgen_vtable__bindgen_id_64007 {
 }
 /**
  * Basic component object model interface. Objects which implement
@@ -1819,7 +1830,7 @@ pub struct bindgen_vtable__bindgen_id_63895 {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsISupports {
-    pub vtable_: *const bindgen_vtable__bindgen_id_63895,
+    pub vtable_: *const bindgen_vtable__bindgen_id_64007,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -1837,7 +1848,7 @@ impl Clone for nsISupports {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_64178 {
+pub struct bindgen_vtable__bindgen_id_64290 {
 }
 /**
  * Participant implementation classes
@@ -1845,7 +1856,7 @@ pub struct bindgen_vtable__bindgen_id_64178 {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCycleCollectionParticipant {
-    pub vtable_: *const bindgen_vtable__bindgen_id_64178,
+    pub vtable_: *const bindgen_vtable__bindgen_id_64290,
     pub mMightSkip: bool,
 }
 #[test]
@@ -1890,6 +1901,7 @@ pub struct nsReadingIterator<CharT> {
 }
 pub type nsReadingIterator_self_type<CharT> = nsReadingIterator<CharT>;
 pub type nsReadingIterator_difference_type = isize;
+pub type nsReadingIterator_size_type = usize;
 pub type nsReadingIterator_value_type<CharT> = CharT;
 pub type nsReadingIterator_pointer<CharT> = *mut CharT;
 pub type nsReadingIterator_reference = [u8; 0usize];
@@ -1905,6 +1917,7 @@ pub struct nsWritingIterator<CharT> {
 }
 pub type nsWritingIterator_self_type<CharT> = nsWritingIterator<CharT>;
 pub type nsWritingIterator_difference_type = isize;
+pub type nsWritingIterator_size_type = usize;
 pub type nsWritingIterator_value_type<CharT> = CharT;
 pub type nsWritingIterator_pointer<CharT> = *mut CharT;
 pub type nsWritingIterator_reference = [u8; 0usize];
@@ -2168,7 +2181,7 @@ fn bindgen_test_layout_ErrorResult() {
 #[derive(Debug)]
 pub struct TErrorResult<CleanupPolicy> {
     pub mResult: nsresult,
-    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_68798<CleanupPolicy>,
+    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_68916<CleanupPolicy>,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
@@ -2185,7 +2198,7 @@ pub struct TErrorResult_DOMExceptionInfo<CleanupPolicy> {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct TErrorResult__bindgen_ty_bindgen_id_68798<CleanupPolicy> {
+pub struct TErrorResult__bindgen_ty_bindgen_id_68916<CleanupPolicy> {
     pub mMessage: __BindgenUnionField<*mut TErrorResult_Message<CleanupPolicy>>,
     pub mJSException: __BindgenUnionField<Value>,
     pub mDOMExceptionInfo: __BindgenUnionField<*mut TErrorResult_DOMExceptionInfo<CleanupPolicy>>,
@@ -2318,7 +2331,55 @@ impl nsIAtom {
     }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_69569 {
+#[derive(Debug, Copy)]
+pub struct nsIPrincipal {
+    pub _base: nsISerializable,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct nsIPrincipal_COMTypeInfo<T, U> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+    pub _phantom_1: ::std::marker::PhantomData<U>,
+}
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum nsIPrincipal__bindgen_ty_bindgen_id_69939 {
+    APP_STATUS_NOT_INSTALLED = 0,
+    APP_STATUS_INSTALLED = 1,
+    APP_STATUS_PRIVILEGED = 2,
+    APP_STATUS_CERTIFIED = 3,
+}
+#[test]
+fn bindgen_test_layout_nsIPrincipal() {
+    assert_eq!(::std::mem::size_of::<nsIPrincipal>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsIPrincipal>() , 8usize);
+}
+impl Clone for nsIPrincipal {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsISerializable {
+    pub _base: nsISupports,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct nsISerializable_COMTypeInfo<T, U> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+    pub _phantom_1: ::std::marker::PhantomData<U>,
+}
+#[test]
+fn bindgen_test_layout_nsISerializable() {
+    assert_eq!(::std::mem::size_of::<nsISerializable>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsISerializable>() , 8usize);
+}
+impl Clone for nsISerializable {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+pub struct bindgen_vtable__bindgen_id_70107 {
 }
 /**
  * Class to store the wrapper for an object. This can only be used with objects
@@ -2360,7 +2421,7 @@ pub struct bindgen_vtable__bindgen_id_69569 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsWrapperCache {
-    pub vtable_: *const bindgen_vtable__bindgen_id_69569,
+    pub vtable_: *const bindgen_vtable__bindgen_id_70107,
     pub mWrapper: *mut JSObject,
     pub mFlags: nsWrapperCache_FlagsType,
 }
@@ -2385,7 +2446,7 @@ pub type nsWrapperCache_FlagsType = u32;
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_69765 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_70303 {
     WRAPPER_BIT_PRESERVED = 1,
 }
 #[repr(u32)]
@@ -2394,12 +2455,12 @@ pub enum nsWrapperCache__bindgen_ty_bindgen_id_69765 {
    * binding.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_69768 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_70306 {
     WRAPPER_IS_NOT_DOM_BINDING = 2,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_69771 {
+pub enum nsWrapperCache__bindgen_ty_bindgen_id_70309 {
     kWrapperFlagsMask = 3,
 }
 #[test]
@@ -2508,7 +2569,7 @@ impl Clone for random_access_iterator_tag {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_89345 {
+pub struct bindgen_vtable__bindgen_id_89978 {
 }
 /**
  * A class of objects that return source code on demand.
@@ -2524,7 +2585,7 @@ pub struct bindgen_vtable__bindgen_id_89345 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct SourceHook {
-    pub vtable_: *const bindgen_vtable__bindgen_id_89345,
+    pub vtable_: *const bindgen_vtable__bindgen_id_89978,
 }
 #[test]
 fn bindgen_test_layout_SourceHook() {
@@ -2532,54 +2593,6 @@ fn bindgen_test_layout_SourceHook() {
     assert_eq!(::std::mem::align_of::<SourceHook>() , 8usize);
 }
 #[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsIPrincipal {
-    pub _base: nsISerializable,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct nsIPrincipal_COMTypeInfo<T, U> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-    pub _phantom_1: ::std::marker::PhantomData<U>,
-}
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPrincipal__bindgen_ty_bindgen_id_94801 {
-    APP_STATUS_NOT_INSTALLED = 0,
-    APP_STATUS_INSTALLED = 1,
-    APP_STATUS_PRIVILEGED = 2,
-    APP_STATUS_CERTIFIED = 3,
-}
-#[test]
-fn bindgen_test_layout_nsIPrincipal() {
-    assert_eq!(::std::mem::size_of::<nsIPrincipal>() , 8usize);
-    assert_eq!(::std::mem::align_of::<nsIPrincipal>() , 8usize);
-}
-impl Clone for nsIPrincipal {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsISerializable {
-    pub _base: nsISupports,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct nsISerializable_COMTypeInfo<T, U> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-    pub _phantom_1: ::std::marker::PhantomData<U>,
-}
-#[test]
-fn bindgen_test_layout_nsISerializable() {
-    assert_eq!(::std::mem::size_of::<nsISerializable>() , 8usize);
-    assert_eq!(::std::mem::align_of::<nsISerializable>() , 8usize);
-}
-impl Clone for nsISerializable {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
 #[derive(Debug)]
 pub struct nsIGlobalObject {
     pub _base: nsISupports,
@@ -2656,6 +2669,7 @@ pub struct nsIDocument {
     pub mBlockAllMixedContentPreloads: bool,
     pub mUpgradeInsecureRequests: bool,
     pub mUpgradeInsecurePreloads: bool,
+    pub mHSTSPrimingURIList: [u64; 5usize],
     pub mDocumentContainer: u64,
     pub mCharacterSet: nsCString,
     pub mCharacterSetSource: i32,
@@ -2863,7 +2877,7 @@ pub type nsIDocument_FrameRequestCallbackList =
     nsTArray<RefPtr<FrameRequestCallback>>;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDocument__bindgen_ty_bindgen_id_103507 { REQUEST_DISCARD = 1, }
+pub enum nsIDocument__bindgen_ty_bindgen_id_103523 { REQUEST_DISCARD = 1, }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIDocument_DeprecatedOperations {
@@ -2890,22 +2904,23 @@ pub enum nsIDocument_DeprecatedOperations {
     eUseOfCaptureEvents = 20,
     eUseOfReleaseEvents = 21,
     eUseOfDOM3LoadMethod = 22,
-    eShowModalDialog = 23,
-    eWindow_Content = 24,
-    eSyncXMLHttpRequest = 25,
-    eDataContainerEvent = 26,
-    eWindow_Controllers = 27,
-    eImportXULIntoContent = 28,
-    ePannerNodeDoppler = 29,
-    eNavigatorGetUserMedia = 30,
-    eWebrtcDeprecatedPrefix = 31,
-    eRTCPeerConnectionGetStreams = 32,
-    eAppCache = 33,
-    ePrefixedImageSmoothingEnabled = 34,
-    ePrefixedFullscreenAPI = 35,
-    eLenientSetter = 36,
-    eFileLastModifiedDate = 37,
-    eDeprecatedOperationCount = 38,
+    eChromeUseOfDOM3LoadMethod = 23,
+    eShowModalDialog = 24,
+    eWindow_Content = 25,
+    eSyncXMLHttpRequest = 26,
+    eDataContainerEvent = 27,
+    eWindow_Controllers = 28,
+    eImportXULIntoContent = 29,
+    ePannerNodeDoppler = 30,
+    eNavigatorGetUserMedia = 31,
+    eWebrtcDeprecatedPrefix = 32,
+    eRTCPeerConnectionGetStreams = 33,
+    eAppCache = 34,
+    ePrefixedImageSmoothingEnabled = 35,
+    ePrefixedFullscreenAPI = 36,
+    eLenientSetter = 37,
+    eFileLastModifiedDate = 38,
+    eDeprecatedOperationCount = 39,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -2945,7 +2960,7 @@ impl Clone for nsIDocument_FrameRequest {
 }
 #[test]
 fn bindgen_test_layout_nsIDocument() {
-    assert_eq!(::std::mem::size_of::<nsIDocument>() , 896usize);
+    assert_eq!(::std::mem::size_of::<nsIDocument>() , 936usize);
     assert_eq!(::std::mem::align_of::<nsIDocument>() , 8usize);
 }
 impl nsIDocument {
@@ -3501,20 +3516,6 @@ impl nsIDocument {
             ((val as u8 as u64) << 41u32) & (2199023255552usize as u64);
     }
     #[inline]
-    pub fn mMayHavePluginFramesForPrinting(&self) -> bool {
-        unsafe {
-            ::std::mem::transmute(((self._bitfield_1 &
-                                        (4398046511104usize as u64)) >> 42u32)
-                                      as u8)
-        }
-    }
-    #[inline]
-    pub fn set_mMayHavePluginFramesForPrinting(&mut self, val: bool) {
-        self._bitfield_1 &= !(4398046511104usize as u64);
-        self._bitfield_1 |=
-            ((val as u8 as u64) << 42u32) & (4398046511104usize as u64);
-    }
-    #[inline]
     pub fn mDidFireDOMContentLoaded(&self) -> bool {
         unsafe {
             ::std::mem::transmute(((self._bitfield_2 & (1usize as u8)) >>
@@ -3554,7 +3555,7 @@ pub struct nsINode {
     pub mNextSibling: *mut nsIContent,
     pub mPreviousSibling: *mut nsIContent,
     pub mFirstChild: *mut nsIContent,
-    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_100207,
+    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_100426,
     pub mSlots: *mut nsINode_nsSlots,
     pub mServoData: ServoCell<*mut ServoNodeData>,
 }
@@ -3579,7 +3580,7 @@ pub struct nsINode_COMTypeInfo<T, U> {
    * Bit-flags to pass (or'ed together) to IsNodeOfType()
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsINode__bindgen_ty_bindgen_id_96345 {
+pub enum nsINode__bindgen_ty_bindgen_id_96564 {
     eCONTENT = 1,
     eDOCUMENT = 2,
     eATTRIBUTE = 4,
@@ -3594,12 +3595,12 @@ pub enum nsINode__bindgen_ty_bindgen_id_96345 {
     eFILTER = 2048,
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_97114 {
+pub struct bindgen_vtable__bindgen_id_97333 {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsINode_nsSlots {
-    pub vtable_: *const bindgen_vtable__bindgen_id_97114,
+    pub vtable_: *const bindgen_vtable__bindgen_id_97333,
     /**
      * A list of mutation observers
      */
@@ -3668,19 +3669,19 @@ pub enum nsINode_BooleanFlag {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsINode__bindgen_ty_bindgen_id_100207 {
+pub struct nsINode__bindgen_ty_bindgen_id_100426 {
     pub mPrimaryFrame: __BindgenUnionField<*mut nsIFrame>,
     pub mSubtreeRoot: __BindgenUnionField<*mut nsINode>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsINode__bindgen_ty_bindgen_id_100207() {
-    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_100207>()
+fn bindgen_test_layout_nsINode__bindgen_ty_bindgen_id_100426() {
+    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_100426>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_100207>()
+    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_100426>()
                , 8usize);
 }
-impl Clone for nsINode__bindgen_ty_bindgen_id_100207 {
+impl Clone for nsINode__bindgen_ty_bindgen_id_100426 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -3779,52 +3780,6 @@ pub enum SheetType {
     Unknown = 255,
 }
 /**
- * Smart pointer class that can hold a pointer to either a CSSStyleSheet
- * or a ServoStyleSheet.
- */
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct StyleSheetHandle {
-    pub mPtr: StyleSheetHandle_Ptr,
-}
-pub type StyleSheetHandle_RefPtr = HandleRefPtr<StyleSheetHandle>;
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct StyleSheetHandle_Ptr {
-    pub mValue: usize,
-}
-#[test]
-fn bindgen_test_layout_StyleSheetHandle_Ptr() {
-    assert_eq!(::std::mem::size_of::<StyleSheetHandle_Ptr>() , 8usize);
-    assert_eq!(::std::mem::align_of::<StyleSheetHandle_Ptr>() , 8usize);
-}
-impl Clone for StyleSheetHandle_Ptr {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_StyleSheetHandle() {
-    assert_eq!(::std::mem::size_of::<StyleSheetHandle>() , 8usize);
-    assert_eq!(::std::mem::align_of::<StyleSheetHandle>() , 8usize);
-}
-impl Clone for StyleSheetHandle {
-    fn clone(&self) -> Self { *self }
-}
-pub const ReferrerPolicy_RP_Default: ReferrerPolicy =
-    ReferrerPolicy::RP_No_Referrer_When_Downgrade;
-#[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum ReferrerPolicy {
-    RP_No_Referrer = 1,
-    RP_Origin = 2,
-    RP_No_Referrer_When_Downgrade = 0,
-    RP_Origin_When_Crossorigin = 3,
-    RP_Unsafe_URL = 4,
-    RP_Same_Origin = 5,
-    RP_Strict_Origin = 6,
-    RP_Strict_Origin_When_Cross_Origin = 7,
-    RP_Unset = 4294967295,
-}
-/**
  * EventStates is the class used to represent the event states of nsIContent
  * instances. These states are calculated by IntrinsicState() and
  * ContentStatesChanged() has to be called when one of them changes thus
@@ -4033,7 +3988,7 @@ pub struct nsIDOMNode_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_108504 {
+pub enum nsIDOMNode__bindgen_ty_bindgen_id_108507 {
     ELEMENT_NODE = 1,
     ATTRIBUTE_NODE = 2,
     TEXT_NODE = 3,
@@ -4049,7 +4004,7 @@ pub enum nsIDOMNode__bindgen_ty_bindgen_id_108504 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_108723 {
+pub enum nsIDOMNode__bindgen_ty_bindgen_id_108726 {
     DOCUMENT_POSITION_DISCONNECTED = 1,
     DOCUMENT_POSITION_PRECEDING = 2,
     DOCUMENT_POSITION_FOLLOWING = 4,
@@ -4890,7 +4845,8 @@ pub enum nsChangeHint {
     nsChangeHint_UpdateComputedBSize = 16777216,
     nsChangeHint_UpdateUsesOpacity = 33554432,
     nsChangeHint_UpdateBackgroundPosition = 67108864,
-    nsChangeHint_AllHints = 134217727,
+    nsChangeHint_AddOrRemoveTransform = 134217728,
+    nsChangeHint_AllHints = 268435455,
 }
 pub type nscolor = u32;
 #[repr(u32)]
@@ -5136,7 +5092,7 @@ pub type nsPtrHashKey_KeyType<T> = *mut T;
 pub type nsPtrHashKey_KeyTypePointer<T> = *mut T;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPtrHashKey__bindgen_ty_bindgen_id_113079 { ALLOW_MEMMOVE = 0, }
+pub enum nsPtrHashKey__bindgen_ty_bindgen_id_113088 { ALLOW_MEMMOVE = 0, }
 /**
  * A node of content in a document's content model. This interface
  * is supported by all content objects.
@@ -5156,14 +5112,14 @@ pub struct nsIContent_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_114419 {
+pub enum nsIContent__bindgen_ty_bindgen_id_114428 {
     eAllChildren = 0,
     eAllButXBL = 1,
     eSkipPlaceholderContent = 2,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_114655 {
+pub enum nsIContent__bindgen_ty_bindgen_id_114664 {
     ATTR_MISSING = -1,
     ATTR_VALUE_NO_MATCH = -2,
 }
@@ -5369,7 +5325,7 @@ pub struct FragmentOrElement_nsDOMSlots {
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
-    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750,
+    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761,
     /**
      * An object implementing the .children property for this element.
      */
@@ -5406,7 +5362,7 @@ pub struct FragmentOrElement_nsDOMSlots {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750 {
+pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761 {
     /**
       * The nearest enclosing content node with a binding that created us.
       * @see FragmentOrElement::GetBindingParent
@@ -5419,13 +5375,13 @@ pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750 {
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750() {
-    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750>()
+fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761() {
+    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750>()
+    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761>()
                , 8usize);
 }
-impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115750 {
+impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_115761 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -5446,6 +5402,21 @@ fn bindgen_test_layout_FragmentOrElement() {
     assert_eq!(::std::mem::size_of::<FragmentOrElement>() , 128usize);
     assert_eq!(::std::mem::align_of::<FragmentOrElement>() , 8usize);
 }
+pub const ReferrerPolicy_RP_Default: ReferrerPolicy =
+    ReferrerPolicy::RP_No_Referrer_When_Downgrade;
+#[repr(u32)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum ReferrerPolicy {
+    RP_No_Referrer = 1,
+    RP_Origin = 2,
+    RP_No_Referrer_When_Downgrade = 0,
+    RP_Origin_When_Crossorigin = 3,
+    RP_Unsafe_URL = 4,
+    RP_Same_Origin = 5,
+    RP_Strict_Origin = 6,
+    RP_Strict_Origin_When_Cross_Origin = 7,
+    RP_Unset = 4294967295,
+}
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsIWeakReference {
@@ -5497,7 +5468,7 @@ pub struct nsIChannel_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_132942 {
+pub enum nsIChannel__bindgen_ty_bindgen_id_132951 {
     LOAD_DOCUMENT_URI = 65536,
     LOAD_RETARGETED_DOCUMENT_URI = 131072,
     LOAD_REPLACE = 262144,
@@ -5511,7 +5482,7 @@ pub enum nsIChannel__bindgen_ty_bindgen_id_132942 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_132962 {
+pub enum nsIChannel__bindgen_ty_bindgen_id_132971 {
     DISPOSITION_INLINE = 0,
     DISPOSITION_ATTACHMENT = 1,
 }
@@ -5537,7 +5508,7 @@ pub struct nsIRequest_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIRequest__bindgen_ty_bindgen_id_132780 {
+pub enum nsIRequest__bindgen_ty_bindgen_id_132789 {
     LOAD_REQUESTMASK = 65535,
     LOAD_NORMAL = 0,
     LOAD_BACKGROUND = 1,
@@ -5665,16 +5636,24 @@ pub enum SheetParsingMode {
     eAgentSheetFeatures = 2,
 }
 /**
- * A class for holding strong references to handle-managed objects.
- *
- * This is intended for use with objects like StyleSheetHandle, where
- * the handle type is not a pointer but which can still have ->AddRef()
- * and ->Release() called on it.
+ * Superclass for data common to CSSStyleSheet and ServoStyleSheet.
  */
 #[repr(C)]
-#[derive(Debug)]
-pub struct HandleRefPtr<T> {
-    pub mHandle: T,
+#[derive(Debug, Copy)]
+pub struct StyleSheet {
+    pub mDocument: *mut nsIDocument,
+    pub mOwningNode: *mut nsINode,
+    pub mParsingMode: SheetParsingMode,
+    pub mType: StyleBackendType,
+    pub mDisabled: bool,
+}
+#[test]
+fn bindgen_test_layout_StyleSheet() {
+    assert_eq!(::std::mem::size_of::<StyleSheet>() , 32usize);
+    assert_eq!(::std::mem::align_of::<StyleSheet>() , 8usize);
+}
+impl Clone for StyleSheet {
+    fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -6090,13 +6069,13 @@ pub enum nsIPresShell_ReflowRootHandling {
     eNoPositionOrSizeChange = 1,
     eInferFromBitToAdd = 2,
 }
-pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_150799 =
-    nsIPresShell__bindgen_ty_bindgen_id_150799::SCROLL_TOP;
-pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_150799 =
-    nsIPresShell__bindgen_ty_bindgen_id_150799::SCROLL_BOTTOM;
+pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_151191 =
+    nsIPresShell__bindgen_ty_bindgen_id_151191::SCROLL_TOP;
+pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_151191 =
+    nsIPresShell__bindgen_ty_bindgen_id_151191::SCROLL_BOTTOM;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_150799 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_151191 {
     SCROLL_TOP = 0,
     SCROLL_BOTTOM = 100,
     SCROLL_CENTER = 50,
@@ -6124,7 +6103,7 @@ impl Clone for nsIPresShell_ScrollAxis {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_150830 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_151222 {
     SCROLL_FIRST_ANCESTOR_ONLY = 1,
     SCROLL_OVERFLOW_HIDDEN = 2,
     SCROLL_NO_PARENT_FRAMES = 4,
@@ -6171,7 +6150,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_150830 {
    * transform.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_151252 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_151646 {
     RENDER_IS_UNTRUSTED = 1,
     RENDER_IGNORE_VIEWPORT_SCROLLING = 2,
     RENDER_CARET = 4,
@@ -6182,7 +6161,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_151252 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_151270 {
+pub enum nsIPresShell__bindgen_ty_bindgen_id_151664 {
     RENDER_IS_IMAGE = 256,
     RENDER_AUTO_SCALE = 128,
 }
@@ -6195,7 +6174,7 @@ pub enum nsIPresShell__bindgen_ty_bindgen_id_151270 {
    * transparent by default.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_151386 { FORCE_DRAW = 1, }
+pub enum nsIPresShell__bindgen_ty_bindgen_id_151780 { FORCE_DRAW = 1, }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIPresShell_PointerCaptureInfo {
@@ -6582,67 +6561,67 @@ pub struct DOMPointInit {
 impl Clone for DOMPointInit {
     fn clone(&self) -> Self { *self }
 }
-pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_LISTENERMANAGER;
-pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_PROPERTIES;
-pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_ANONYMOUS_ROOT;
-pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
-pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_NATIVE_ANONYMOUS_ROOT;
-pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_FORCE_XBL_BINDINGS;
-pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_MAY_BE_IN_BINDING_MNGR;
-pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_EDITABLE;
-pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_MAY_HAVE_CLASS;
-pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_IN_SHADOW_TREE;
-pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_EMPTY_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_SLOW_SELECTOR;
-pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_EDGE_CHILD_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_152781
+pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_LISTENERMANAGER;
+pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_PROPERTIES;
+pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_ANONYMOUS_ROOT;
+pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
+pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_NATIVE_ANONYMOUS_ROOT;
+pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_FORCE_XBL_BINDINGS;
+pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_MAY_BE_IN_BINDING_MNGR;
+pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_EDITABLE;
+pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_MAY_HAVE_CLASS;
+pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_IN_SHADOW_TREE;
+pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_EMPTY_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_SLOW_SELECTOR;
+pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_EDGE_CHILD_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_153175
           =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
-pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_ALL_SELECTOR_FLAGS;
-pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_NEEDS_FRAME;
-pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_DESCENDANTS_NEED_FRAMES;
-pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_ACCESSKEY;
-pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_DIRECTION_RTL;
-pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_HAS_DIRECTION_LTR;
-pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_ALL_DIRECTION_FLAGS;
-pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_CHROME_ONLY_ACCESS;
-pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
-pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_152781
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
+pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_ALL_SELECTOR_FLAGS;
+pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_NEEDS_FRAME;
+pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_DESCENDANTS_NEED_FRAMES;
+pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_ACCESSKEY;
+pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_DIRECTION_RTL;
+pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_HAS_DIRECTION_LTR;
+pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_ALL_DIRECTION_FLAGS;
+pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_CHROME_ONLY_ACCESS;
+pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
+pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_153175
           =
-    _bindgen_ty_bindgen_id_152781::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_152781 =
-    _bindgen_ty_bindgen_id_152781::NODE_TYPE_SPECIFIC_BITS_OFFSET;
+    _bindgen_ty_bindgen_id_153175::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_153175 =
+    _bindgen_ty_bindgen_id_153175::NODE_TYPE_SPECIFIC_BITS_OFFSET;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum _bindgen_ty_bindgen_id_152781 {
+pub enum _bindgen_ty_bindgen_id_153175 {
     NODE_HAS_LISTENERMANAGER = 4,
     NODE_HAS_PROPERTIES = 8,
     NODE_IS_ANONYMOUS_ROOT = 16,
@@ -6700,7 +6679,7 @@ pub struct nsITimer_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsITimer__bindgen_ty_bindgen_id_169494 {
+pub enum nsITimer__bindgen_ty_bindgen_id_169936 {
     TYPE_ONE_SHOT = 0,
     TYPE_REPEATING_SLACK = 1,
     TYPE_REPEATING_PRECISE = 2,
@@ -6726,7 +6705,7 @@ pub struct nsExpirationState {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsExpirationState__bindgen_ty_bindgen_id_169970 {
+pub enum nsExpirationState__bindgen_ty_bindgen_id_170412 {
     NOT_TRACKED = 15,
     MAX_INDEX_IN_GENERATION = 268435455,
 }
@@ -6800,7 +6779,7 @@ pub struct imgIRequest_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_170557 {
+pub enum imgIRequest__bindgen_ty_bindgen_id_170996 {
     STATUS_NONE = 0,
     STATUS_SIZE_AVAILABLE = 1,
     STATUS_LOAD_COMPLETE = 2,
@@ -6812,7 +6791,7 @@ pub enum imgIRequest__bindgen_ty_bindgen_id_170557 {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_170637 {
+pub enum imgIRequest__bindgen_ty_bindgen_id_171076 {
     CORS_NONE = 1,
     CORS_ANONYMOUS = 2,
     CORS_USE_CREDENTIALS = 3,
@@ -7311,7 +7290,7 @@ pub type nsPresArena_FreeList_KeyType = u32;
 pub type nsPresArena_FreeList_KeyTypePointer = *const ::std::os::raw::c_void;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_191019 {
+pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_191458 {
     ALLOW_MEMMOVE = 0,
 }
 #[test]
@@ -7338,7 +7317,7 @@ pub struct imgINotificationObserver_COMTypeInfo<T, U> {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgINotificationObserver__bindgen_ty_bindgen_id_191166 {
+pub enum imgINotificationObserver__bindgen_ty_bindgen_id_191605 {
     SIZE_AVAILABLE = 1,
     FRAME_UPDATE = 2,
     FRAME_COMPLETE = 3,
@@ -7587,7 +7566,7 @@ pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_192404
+pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_192843
          {
     ALLOW_MEMMOVE = 1,
 }
@@ -7983,23 +7962,23 @@ pub enum nsStyleUnit {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_bindgen_id_193157 {
+pub struct _bindgen_ty_bindgen_id_193590 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mPointer: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout__bindgen_ty_bindgen_id_193157() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_193157>() ,
+fn bindgen_test_layout__bindgen_ty_bindgen_id_193590() {
+    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_193590>() ,
                8usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_193157>() ,
+    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_193590>() ,
                8usize);
 }
-impl Clone for _bindgen_ty_bindgen_id_193157 {
+impl Clone for _bindgen_ty_bindgen_id_193590 {
     fn clone(&self) -> Self { *self }
 }
-pub type nsStyleUnion = _bindgen_ty_bindgen_id_193157;
+pub type nsStyleUnion = _bindgen_ty_bindgen_id_193590;
 /**
  * Class that hold a single size specification used by the style
  * system.  The size specification consists of two parts -- a number
@@ -8191,6 +8170,18 @@ fn bindgen_test_layout_nsStyleDisplay() {
     assert_eq!(::std::mem::size_of::<nsStyleDisplay>() , 424usize);
     assert_eq!(::std::mem::align_of::<nsStyleDisplay>() , 8usize);
 }
+/**
+ * A class for holding strong references to handle-managed objects.
+ *
+ * This is intended for use with objects like RestyleManagerHandle,
+ * where the handle type is not a pointer but which can still have
+ * ->AddRef() and ->Release() called on it.
+ */
+#[repr(C)]
+#[derive(Debug)]
+pub struct HandleRefPtr<T> {
+    pub mHandle: T,
+}
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsILanguageAtomService {
@@ -9045,7 +9036,7 @@ fn bindgen_test_layout_imgRequestProxy() {
     assert_eq!(::std::mem::align_of::<imgRequestProxy>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_202198 {
+pub struct bindgen_vtable__bindgen_id_202634 {
 }
 /**
  * An interface for observing changes to image state, as reported by
@@ -9062,7 +9053,7 @@ pub struct bindgen_vtable__bindgen_id_202198 {
 #[repr(C)]
 #[derive(Debug)]
 pub struct IProgressObserver {
-    pub vtable_: *const bindgen_vtable__bindgen_id_202198,
+    pub vtable_: *const bindgen_vtable__bindgen_id_202634,
     pub _base: u64,
 }
 #[test]
@@ -9084,7 +9075,7 @@ pub struct nsISupportsPriority_COMTypeInfo<T, U> {
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsISupportsPriority__bindgen_ty_bindgen_id_202274 {
+pub enum nsISupportsPriority__bindgen_ty_bindgen_id_202710 {
     PRIORITY_HIGHEST = -20,
     PRIORITY_HIGH = -10,
     PRIORITY_NORMAL = 0,
@@ -9519,7 +9510,7 @@ fn bindgen_test_layout_nsCSSValueFloatColor() {
 #[derive(Debug)]
 pub struct nsCSSValue {
     pub mUnit: nsCSSUnit,
-    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_205269,
+    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_205705,
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -9535,7 +9526,7 @@ fn bindgen_test_layout_nsCSSValue_Array() {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsCSSValue__bindgen_ty_bindgen_id_205269 {
+pub struct nsCSSValue__bindgen_ty_bindgen_id_205705 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mString: __BindgenUnionField<*mut nsStringBuffer>,
@@ -9560,13 +9551,13 @@ pub struct nsCSSValue__bindgen_ty_bindgen_id_205269 {
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_205269() {
-    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_205269>()
+fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_205705() {
+    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_205705>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_205269>()
+    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_205705>()
                , 8usize);
 }
-impl Clone for nsCSSValue__bindgen_ty_bindgen_id_205269 {
+impl Clone for nsCSSValue__bindgen_ty_bindgen_id_205705 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -9587,12 +9578,12 @@ fn bindgen_test_layout_nsCSSValueGradientStop() {
     assert_eq!(::std::mem::align_of::<nsCSSValueGradientStop>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_205477 {
+pub struct bindgen_vtable__bindgen_id_205913 {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct CounterStyle {
-    pub vtable_: *const bindgen_vtable__bindgen_id_205477,
+    pub vtable_: *const bindgen_vtable__bindgen_id_205913,
     pub mStyle: i32,
 }
 #[test]
@@ -9792,25 +9783,25 @@ pub struct nsStyleImage {
     pub mCachedBIData: UniquePtr<CachedBorderImageData,
                                  DefaultDelete<CachedBorderImageData>>,
     pub mType: nsStyleImageType,
-    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_207445,
+    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_207881,
     pub mCropRect: UniquePtr<nsStyleSides, DefaultDelete<nsStyleSides>>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleImage__bindgen_ty_bindgen_id_207445 {
+pub struct nsStyleImage__bindgen_ty_bindgen_id_207881 {
     pub mImage: __BindgenUnionField<*mut imgRequestProxy>,
     pub mGradient: __BindgenUnionField<*mut nsStyleGradient>,
     pub mElementId: __BindgenUnionField<*mut u16>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleImage__bindgen_ty_bindgen_id_207445() {
-    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_207445>()
+fn bindgen_test_layout_nsStyleImage__bindgen_ty_bindgen_id_207881() {
+    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_207881>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_207445>()
+    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_207881>()
                , 8usize);
 }
-impl Clone for nsStyleImage__bindgen_ty_bindgen_id_207445 {
+impl Clone for nsStyleImage__bindgen_ty_bindgen_id_207881 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -9861,7 +9852,7 @@ pub struct nsStyleImageLayers {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_207498 {
+pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_207934 {
     shorthand = 0,
     color = 1,
     image = 2,
@@ -10051,15 +10042,51 @@ pub struct nsStyleBorder {
     pub mBorderImageRepeatV: u8,
     pub mFloatEdge: StyleFloatEdge,
     pub mBoxDecorationBreak: StyleBoxDecorationBreak,
+    pub mBorderStyle: [u8; 4usize],
+    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_bindgen_id_208608,
     pub mComputedBorder: nsMargin,
     pub mBorder: nsMargin,
-    pub mBorderStyle: [u8; 4usize],
-    pub mBorderColor: [nscolor; 4usize],
     pub mTwipsPerPixel: nscoord,
 }
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleBorder__bindgen_ty_bindgen_id_208608 {
+    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609>,
+    pub mBorderColor: __BindgenUnionField<[StyleComplexColor; 4usize]>,
+    pub bindgen_union_field: [u32; 8usize],
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609 {
+    pub mBorderTopColor: StyleComplexColor,
+    pub mBorderRightColor: StyleComplexColor,
+    pub mBorderBottomColor: StyleComplexColor,
+    pub mBorderLeftColor: StyleComplexColor,
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609>()
+               , 32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609>()
+               , 4usize);
+}
+impl Clone for
+ nsStyleBorder__bindgen_ty_bindgen_id_208608__bindgen_ty_bindgen_id_208609 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_208608() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_208608>()
+               , 32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_208608>()
+               , 4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_bindgen_id_208608 {
+    fn clone(&self) -> Self { *self }
+}
 #[test]
 fn bindgen_test_layout_nsStyleBorder() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 296usize);
+    assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 312usize);
     assert_eq!(::std::mem::align_of::<nsStyleBorder>() , 8usize);
 }
 #[repr(C)]
@@ -10068,9 +10095,9 @@ pub struct nsStyleOutline {
     pub mOutlineRadius: nsStyleCorners,
     pub mOutlineWidth: nsStyleCoord,
     pub mOutlineOffset: nscoord,
-    pub mActualOutlineWidth: nscoord,
-    pub mOutlineColor: nscolor,
+    pub mOutlineColor: StyleComplexColor,
     pub mOutlineStyle: u8,
+    pub mActualOutlineWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
 #[test]
@@ -10256,11 +10283,11 @@ fn bindgen_test_layout_nsStyleTextOverflow() {
 pub struct nsStyleTextReset {
     pub mTextOverflow: nsStyleTextOverflow,
     pub mTextDecorationLine: u8,
+    pub mTextDecorationStyle: u8,
     pub mUnicodeBidi: u8,
     pub mInitialLetterSink: nscoord,
     pub mInitialLetterSize: f32,
-    pub mTextDecorationStyle: u8,
-    pub mTextDecorationColor: nscolor,
+    pub mTextDecorationColor: StyleComplexColor,
 }
 #[test]
 fn bindgen_test_layout_nsStyleTextReset() {
@@ -10361,7 +10388,7 @@ impl Clone for nsStyleImageOrientation {
 #[derive(Debug, Copy)]
 pub struct nsTimingFunction {
     pub mType: nsTimingFunction_Type,
-    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_209251,
+    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_209586,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -10380,56 +10407,56 @@ pub enum nsTimingFunction_Type {
 pub enum nsTimingFunction_Keyword { Implicit = 0, Explicit = 1, }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_209251 {
-    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252>,
-    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263>,
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_209586 {
+    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587>,
+    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598>,
     pub bindgen_union_field: [u32; 4usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252 {
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587 {
     pub mX1: f32,
     pub mY1: f32,
     pub mX2: f32,
     pub mY2: f32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587>()
                , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587>()
                , 4usize);
 }
 impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209252
+ nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209587
  {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263 {
+pub struct nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598 {
     pub mSteps: u32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598>()
                , 4usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598>()
                , 4usize);
 }
 impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_209251__bindgen_ty_bindgen_id_209263
+ nsTimingFunction__bindgen_ty_bindgen_id_209586__bindgen_ty_bindgen_id_209598
  {
     fn clone(&self) -> Self { *self }
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209251() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251>()
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_209586() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586>()
                , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209251>()
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_209586>()
                , 4usize);
 }
-impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_209251 {
+impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_209586 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10490,13 +10517,13 @@ fn bindgen_test_layout_StyleBasicShape() {
 #[repr(C)]
 #[derive(Debug)]
 pub struct StyleShapeSource<ReferenceBox> {
-    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_209634<ReferenceBox>,
+    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_209969<ReferenceBox>,
     pub mType: StyleShapeSourceType,
     pub mReferenceBox: ReferenceBox,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct StyleShapeSource__bindgen_ty_bindgen_id_209634<ReferenceBox> {
+pub struct StyleShapeSource__bindgen_ty_bindgen_id_209969<ReferenceBox> {
     pub mBasicShape: __BindgenUnionField<*mut StyleBasicShape>,
     pub mURL: __BindgenUnionField<*mut FragmentOrURL>,
     pub bindgen_union_field: u64,
@@ -10548,24 +10575,24 @@ pub enum nsStyleContentType {
 #[derive(Debug)]
 pub struct nsStyleContentData {
     pub mType: nsStyleContentType,
-    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_209718,
+    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_210053,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleContentData__bindgen_ty_bindgen_id_209718 {
+pub struct nsStyleContentData__bindgen_ty_bindgen_id_210053 {
     pub mString: __BindgenUnionField<*mut u16>,
     pub mImage: __BindgenUnionField<*mut imgRequestProxy>,
     pub mCounters: __BindgenUnionField<*mut nsCSSValue_Array>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleContentData__bindgen_ty_bindgen_id_209718() {
-    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_209718>()
+fn bindgen_test_layout_nsStyleContentData__bindgen_ty_bindgen_id_210053() {
+    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_210053>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_209718>()
+    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_210053>()
                , 8usize);
 }
-impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_209718 {
+impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_210053 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10632,12 +10659,11 @@ pub struct nsStyleUserInterface {
     pub mUserFocus: StyleUserFocus,
     pub mPointerEvents: u8,
     pub mCursor: u8,
-    pub mCursorArrayLength: u32,
-    pub mCursorArray: *mut nsCursorImage,
+    pub mCursorImages: nsTArray<nsCursorImage>,
 }
 #[test]
 fn bindgen_test_layout_nsStyleUserInterface() {
-    assert_eq!(::std::mem::size_of::<nsStyleUserInterface>() , 24usize);
+    assert_eq!(::std::mem::size_of::<nsStyleUserInterface>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsStyleUserInterface>() , 8usize);
 }
 #[repr(C)]
@@ -10662,10 +10688,9 @@ pub struct nsStyleColumn {
     pub mColumnCount: u32,
     pub mColumnWidth: nsStyleCoord,
     pub mColumnGap: nsStyleCoord,
-    pub mColumnRuleColor: nscolor,
+    pub mColumnRuleColor: StyleComplexColor,
     pub mColumnRuleStyle: u8,
     pub mColumnFill: u8,
-    pub mColumnRuleColorIsForeground: bool,
     pub mColumnRuleWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
@@ -10675,7 +10700,7 @@ extern "C" {
 }
 #[test]
 fn bindgen_test_layout_nsStyleColumn() {
-    assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 56usize);
+    assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 64usize);
     assert_eq!(::std::mem::align_of::<nsStyleColumn>() , 8usize);
 }
 #[repr(u32)]
@@ -10690,25 +10715,25 @@ pub enum nsStyleSVGPaintType {
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleSVGPaint {
-    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_210115,
+    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_210438,
     pub mType: nsStyleSVGPaintType,
     pub mFallbackColor: nscolor,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_210115 {
+pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_210438 {
     pub mColor: __BindgenUnionField<nscolor>,
     pub mPaintServer: __BindgenUnionField<*mut FragmentOrURL>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_210115() {
-    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_210115>()
+fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_210438() {
+    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_210438>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_210115>()
+    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_210438>()
                , 8usize);
 }
-impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_210115 {
+impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_210438 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
@@ -10743,7 +10768,7 @@ pub struct nsStyleSVG {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleSVG__bindgen_ty_bindgen_id_210292 {
+pub enum nsStyleSVG__bindgen_ty_bindgen_id_210615 {
     FILL_OPACITY_SOURCE_MASK = 3,
     STROKE_OPACITY_SOURCE_MASK = 12,
     STROKE_DASHARRAY_CONTEXT = 16,
@@ -10762,23 +10787,23 @@ fn bindgen_test_layout_nsStyleSVG() {
 pub struct nsStyleFilter {
     pub mType: i32,
     pub mFilterParameter: nsStyleCoord,
-    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_210358,
+    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_210681,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleFilter__bindgen_ty_bindgen_id_210358 {
+pub struct nsStyleFilter__bindgen_ty_bindgen_id_210681 {
     pub mURL: __BindgenUnionField<*mut FragmentOrURL>,
     pub mDropShadow: __BindgenUnionField<*mut nsCSSShadowArray>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_210358() {
-    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_210358>()
+fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_210681() {
+    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_210681>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_210358>()
+    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_210681>()
                , 8usize);
 }
-impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_210358 {
+impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_210681 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
diff --git a/components/style/gecko_bindings/sugar/mod.rs b/components/style/gecko_bindings/sugar/mod.rs
index a451d67a06d..7bb7012118c 100644
--- a/components/style/gecko_bindings/sugar/mod.rs
+++ b/components/style/gecko_bindings/sugar/mod.rs
@@ -7,3 +7,4 @@ mod ns_style_auto_array;
 pub mod ns_style_coord;
 mod ns_t_array;
 pub mod ownership;
+mod style_complex_color;
diff --git a/components/style/gecko_bindings/sugar/style_complex_color.rs b/components/style/gecko_bindings/sugar/style_complex_color.rs
new file mode 100644
index 00000000000..288d395b1ac
--- /dev/null
+++ b/components/style/gecko_bindings/sugar/style_complex_color.rs
@@ -0,0 +1,47 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use cssparser::Color;
+use gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor};
+use gecko_bindings::structs::{nscolor, StyleComplexColor};
+
+impl From<nscolor> for StyleComplexColor {
+    fn from(other: nscolor) -> Self {
+        StyleComplexColor {
+            mColor: other,
+            mForegroundRatio: 0,
+        }
+    }
+}
+
+impl StyleComplexColor {
+    pub fn current_color() -> Self {
+        StyleComplexColor {
+            mColor: 0,
+            mForegroundRatio: 255,
+        }
+    }
+}
+
+impl From<Color> for StyleComplexColor {
+    fn from(other: Color) -> Self {
+        match other {
+            Color::RGBA(rgba) => convert_rgba_to_nscolor(&rgba).into(),
+            Color::CurrentColor => StyleComplexColor::current_color(),
+        }
+    }
+}
+
+impl From<StyleComplexColor> for Color {
+    fn from(other: StyleComplexColor) -> Self {
+        if other.mForegroundRatio == 0 {
+            Color::RGBA(convert_nscolor_to_rgba(other.mColor))
+        } else if other.mForegroundRatio == 255 {
+            Color::CurrentColor
+        } else {
+            // FIXME #13546 handle interpolation values
+            Color::CurrentColor
+        }
+    }
+}
diff --git a/components/style/gecko_string_cache/atom_macro.rs b/components/style/gecko_string_cache/atom_macro.rs
index 1fe410ef9e7..98297a6b63b 100644
--- a/components/style/gecko_string_cache/atom_macro.rs
+++ b/components/style/gecko_string_cache/atom_macro.rs
@@ -1726,6 +1726,8 @@ cfg_if! {
             pub static nsGkAtoms_onpopuphidden: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms13onpopuphidingE"]
             pub static nsGkAtoms_onpopuphiding: *mut nsIAtom;
+            #[link_name = "_ZN9nsGkAtoms17onpopuppositionedE"]
+            pub static nsGkAtoms_onpopuppositioned: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms14onpopupshowingE"]
             pub static nsGkAtoms_onpopupshowing: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms12onpopupshownE"]
@@ -4316,10 +4318,6 @@ cfg_if! {
             pub static nsGkAtoms_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms28scrollbar_thumb_proportionalE"]
             pub static nsGkAtoms_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "_ZN9nsGkAtoms15images_in_menusE"]
-            pub static nsGkAtoms_images_in_menus: *mut nsIAtom;
-            #[link_name = "_ZN9nsGkAtoms17images_in_buttonsE"]
-            pub static nsGkAtoms_images_in_buttons: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms18overlay_scrollbarsE"]
             pub static nsGkAtoms_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms21windows_default_themeE"]
@@ -4370,10 +4368,6 @@ cfg_if! {
             pub static nsGkAtoms__moz_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms33_moz_scrollbar_thumb_proportionalE"]
             pub static nsGkAtoms__moz_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "_ZN9nsGkAtoms20_moz_images_in_menusE"]
-            pub static nsGkAtoms__moz_images_in_menus: *mut nsIAtom;
-            #[link_name = "_ZN9nsGkAtoms22_moz_images_in_buttonsE"]
-            pub static nsGkAtoms__moz_images_in_buttons: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms23_moz_overlay_scrollbarsE"]
             pub static nsGkAtoms__moz_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "_ZN9nsGkAtoms26_moz_windows_default_themeE"]
@@ -6647,6 +6641,8 @@ cfg_if! {
             pub static nsGkAtoms_onpopuphidden: *mut nsIAtom;
             #[link_name = "?onpopuphiding@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms_onpopuphiding: *mut nsIAtom;
+            #[link_name = "?onpopuppositioned@nsGkAtoms@@2PEAVnsIAtom@@EA"]
+            pub static nsGkAtoms_onpopuppositioned: *mut nsIAtom;
             #[link_name = "?onpopupshowing@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms_onpopupshowing: *mut nsIAtom;
             #[link_name = "?onpopupshown@nsGkAtoms@@2PEAVnsIAtom@@EA"]
@@ -9237,10 +9233,6 @@ cfg_if! {
             pub static nsGkAtoms_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "?scrollbar_thumb_proportional@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "?images_in_menus@nsGkAtoms@@2PEAVnsIAtom@@EA"]
-            pub static nsGkAtoms_images_in_menus: *mut nsIAtom;
-            #[link_name = "?images_in_buttons@nsGkAtoms@@2PEAVnsIAtom@@EA"]
-            pub static nsGkAtoms_images_in_buttons: *mut nsIAtom;
             #[link_name = "?overlay_scrollbars@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "?windows_default_theme@nsGkAtoms@@2PEAVnsIAtom@@EA"]
@@ -9291,10 +9283,6 @@ cfg_if! {
             pub static nsGkAtoms__moz_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "?_moz_scrollbar_thumb_proportional@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms__moz_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "?_moz_images_in_menus@nsGkAtoms@@2PEAVnsIAtom@@EA"]
-            pub static nsGkAtoms__moz_images_in_menus: *mut nsIAtom;
-            #[link_name = "?_moz_images_in_buttons@nsGkAtoms@@2PEAVnsIAtom@@EA"]
-            pub static nsGkAtoms__moz_images_in_buttons: *mut nsIAtom;
             #[link_name = "?_moz_overlay_scrollbars@nsGkAtoms@@2PEAVnsIAtom@@EA"]
             pub static nsGkAtoms__moz_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "?_moz_windows_default_theme@nsGkAtoms@@2PEAVnsIAtom@@EA"]
@@ -11568,6 +11556,8 @@ cfg_if! {
             pub static nsGkAtoms_onpopuphidden: *mut nsIAtom;
             #[link_name = "\x01?onpopuphiding@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms_onpopuphiding: *mut nsIAtom;
+            #[link_name = "\x01?onpopuppositioned@nsGkAtoms@@2PAVnsIAtom@@A"]
+            pub static nsGkAtoms_onpopuppositioned: *mut nsIAtom;
             #[link_name = "\x01?onpopupshowing@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms_onpopupshowing: *mut nsIAtom;
             #[link_name = "\x01?onpopupshown@nsGkAtoms@@2PAVnsIAtom@@A"]
@@ -14158,10 +14148,6 @@ cfg_if! {
             pub static nsGkAtoms_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "\x01?scrollbar_thumb_proportional@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "\x01?images_in_menus@nsGkAtoms@@2PAVnsIAtom@@A"]
-            pub static nsGkAtoms_images_in_menus: *mut nsIAtom;
-            #[link_name = "\x01?images_in_buttons@nsGkAtoms@@2PAVnsIAtom@@A"]
-            pub static nsGkAtoms_images_in_buttons: *mut nsIAtom;
             #[link_name = "\x01?overlay_scrollbars@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "\x01?windows_default_theme@nsGkAtoms@@2PAVnsIAtom@@A"]
@@ -14212,10 +14198,6 @@ cfg_if! {
             pub static nsGkAtoms__moz_scrollbar_end_forward: *mut nsIAtom;
             #[link_name = "\x01?_moz_scrollbar_thumb_proportional@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms__moz_scrollbar_thumb_proportional: *mut nsIAtom;
-            #[link_name = "\x01?_moz_images_in_menus@nsGkAtoms@@2PAVnsIAtom@@A"]
-            pub static nsGkAtoms__moz_images_in_menus: *mut nsIAtom;
-            #[link_name = "\x01?_moz_images_in_buttons@nsGkAtoms@@2PAVnsIAtom@@A"]
-            pub static nsGkAtoms__moz_images_in_buttons: *mut nsIAtom;
             #[link_name = "\x01?_moz_overlay_scrollbars@nsGkAtoms@@2PAVnsIAtom@@A"]
             pub static nsGkAtoms__moz_overlay_scrollbars: *mut nsIAtom;
             #[link_name = "\x01?_moz_windows_default_theme@nsGkAtoms@@2PAVnsIAtom@@A"]
@@ -15639,6 +15621,7 @@ macro_rules! atom {
 ("onpointerlockerror") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpointerlockerror as *mut _) };
 ("onpopuphidden") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpopuphidden as *mut _) };
 ("onpopuphiding") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpopuphiding as *mut _) };
+("onpopuppositioned") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpopuppositioned as *mut _) };
 ("onpopupshowing") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpopupshowing as *mut _) };
 ("onpopupshown") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onpopupshown as *mut _) };
 ("onposter") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onposter as *mut _) };
@@ -16934,8 +16917,6 @@ macro_rules! atom {
 ("scrollbar-end-backward") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrollbar_end_backward as *mut _) };
 ("scrollbar-end-forward") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrollbar_end_forward as *mut _) };
 ("scrollbar-thumb-proportional") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrollbar_thumb_proportional as *mut _) };
-("images-in-menus") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_images_in_menus as *mut _) };
-("images-in-buttons") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_images_in_buttons as *mut _) };
 ("overlay-scrollbars") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_overlay_scrollbars as *mut _) };
 ("windows-default-theme") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_default_theme as *mut _) };
 ("mac-graphite-theme") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_mac_graphite_theme as *mut _) };
@@ -16961,8 +16942,6 @@ macro_rules! atom {
 ("-moz-scrollbar-end-backward") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_scrollbar_end_backward as *mut _) };
 ("-moz-scrollbar-end-forward") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_scrollbar_end_forward as *mut _) };
 ("-moz-scrollbar-thumb-proportional") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_scrollbar_thumb_proportional as *mut _) };
-("-moz-images-in-menus") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_images_in_menus as *mut _) };
-("-moz-images-in-buttons") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_images_in_buttons as *mut _) };
 ("-moz-overlay-scrollbars") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_overlay_scrollbars as *mut _) };
 ("-moz-windows-default-theme") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_windows_default_theme as *mut _) };
 ("-moz-mac-graphite-theme") => { $crate::string_cache::atom_macro::unsafe_atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_mac_graphite_theme as *mut _) };
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index bd5d2647f51..99f6c0cdda3 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -195,20 +195,20 @@ pub struct ${style_struct.gecko_struct_name} {
 </%def>
 
 <%!
-def is_border_style_masked(ffi_name):
-    return ffi_name.split("[")[0] in ["mBorderStyle", "mOutlineStyle", "mTextDecorationStyle"]
-
-def get_gecko_property(ffi_name):
-    if is_border_style_masked(ffi_name):
-        return "(self.gecko.%s & (structs::BORDER_STYLE_MASK as u8))" % ffi_name
-    return "self.gecko.%s" % ffi_name
+def get_gecko_property(ffi_name, self_param = "self"):
+    if "mBorderColor" in ffi_name:
+        return ffi_name.replace("mBorderColor",
+                                "unsafe { *%s.gecko.__bindgen_anon_1.mBorderColor.as_ref() }"
+                                % self_param)
+    return "%s.gecko.%s" % (self_param, ffi_name)
 
 def set_gecko_property(ffi_name, expr):
-    if is_border_style_masked(ffi_name):
-        return "self.gecko.%s &= !(structs::BORDER_STYLE_MASK as u8);" % ffi_name + \
-               "self.gecko.%s |= %s as u8;" % (ffi_name, expr)
-    elif ffi_name == "__LIST_STYLE_TYPE__":
+    if ffi_name == "__LIST_STYLE_TYPE__":
         return "unsafe { Gecko_SetListStyleType(&mut self.gecko, %s as u32); }" % expr
+    if "mBorderColor" in ffi_name:
+        ffi_name = ffi_name.replace("mBorderColor",
+                                    "*self.gecko.__bindgen_anon_1.mBorderColor.as_mut()")
+        return "unsafe { %s = %s };" % (ffi_name, expr)
     return "self.gecko.%s = %s;" % (ffi_name, expr)
 %>
 
@@ -240,71 +240,41 @@ def set_gecko_property(ffi_name, expr):
     }
 </%def>
 
-<%def name="clear_color_flags(color_flags_ffi_name)">
-    % if color_flags_ffi_name:
-    self.gecko.${color_flags_ffi_name} &= !(structs::BORDER_COLOR_SPECIAL as u8);
-    % endif
-</%def>
-
-<%def name="set_current_color_flag(color_flags_ffi_name)">
-    % if color_flags_ffi_name:
-    self.gecko.${color_flags_ffi_name} |= structs::BORDER_COLOR_FOREGROUND as u8;
-    % else:
-    // FIXME(heycam): This is a Gecko property that doesn't store currentColor
-    // as a computed value.  These are currently handled by converting
-    // currentColor to the current value of the color property at computed
-    // value time, but we don't have access to the Color struct here.
-    // In the longer term, Gecko should store currentColor as a computed
-    // value, so that we don't need to do this:
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=760345
-    warn!("stylo: mishandling currentColor");
-    % endif
-</%def>
-
-<%def name="get_current_color_flag_from(field)">
-    (${field} & (structs::BORDER_COLOR_FOREGROUND as u8)) != 0
-</%def>
-
-<%def name="impl_color_setter(ident, gecko_ffi_name, color_flags_ffi_name=None)">
+<%def name="impl_color_setter(ident, gecko_ffi_name, complex_color=True)">
     #[allow(unreachable_code)]
     #[allow(non_snake_case)]
     pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
-        use cssparser::Color;
-        ${clear_color_flags(color_flags_ffi_name)}
-        let result = match v {
-            Color::CurrentColor => {
-                ${set_current_color_flag(color_flags_ffi_name)}
-                0
-            },
-            Color::RGBA(rgba) => convert_rgba_to_nscolor(&rgba),
-        };
+        % if complex_color:
+            let result = v.into();
+        % else:
+            use cssparser::Color;
+            let result = match v {
+                Color::RGBA(rgba) => convert_rgba_to_nscolor(&rgba),
+                // FIXME #13547
+                Color::CurrentColor => 0,
+            };
+        % endif
         ${set_gecko_property(gecko_ffi_name, "result")}
     }
 </%def>
 
-<%def name="impl_color_copy(ident, gecko_ffi_name, color_flags_ffi_name=None)">
+<%def name="impl_color_copy(ident, gecko_ffi_name, complex_color=True)">
     #[allow(non_snake_case)]
     pub fn copy_${ident}_from(&mut self, other: &Self) {
-        % if color_flags_ffi_name:
-            ${clear_color_flags(color_flags_ffi_name)}
-            if ${get_current_color_flag_from("other.gecko." + color_flags_ffi_name)} {
-                ${set_current_color_flag(color_flags_ffi_name)}
-            }
-        % endif
-        self.gecko.${gecko_ffi_name} = other.gecko.${gecko_ffi_name}
+        let color = ${get_gecko_property(gecko_ffi_name, self_param = "other")};
+        ${set_gecko_property(gecko_ffi_name, "color")};
     }
 </%def>
 
-<%def name="impl_color_clone(ident, gecko_ffi_name, color_flags_ffi_name=None)">
+<%def name="impl_color_clone(ident, gecko_ffi_name, complex_color=True)">
     #[allow(non_snake_case)]
     pub fn clone_${ident}(&self) -> longhands::${ident}::computed_value::T {
-        use cssparser::Color;
-        % if color_flags_ffi_name:
-            if ${get_current_color_flag_from("self.gecko." + color_flags_ffi_name)} {
-                return Color::CurrentColor
-            }
+        % if complex_color:
+            ${get_gecko_property(gecko_ffi_name)}.into()
+        % else:
+            use cssparser::Color;
+            Color::RGBA(convert_nscolor_to_rgba(${get_gecko_property(gecko_ffi_name)}))
         % endif
-        Color::RGBA(convert_nscolor_to_rgba(${get_gecko_property(gecko_ffi_name)}))
     }
 </%def>
 
@@ -324,11 +294,11 @@ def set_gecko_property(ffi_name, expr):
 % endif
 </%def>
 
-<%def name="impl_color(ident, gecko_ffi_name, color_flags_ffi_name=None, need_clone=False)">
-<%call expr="impl_color_setter(ident, gecko_ffi_name, color_flags_ffi_name)"></%call>
-<%call expr="impl_color_copy(ident, gecko_ffi_name, color_flags_ffi_name)"></%call>
+<%def name="impl_color(ident, gecko_ffi_name, need_clone=False, complex_color=True)">
+<%call expr="impl_color_setter(ident, gecko_ffi_name, complex_color)"></%call>
+<%call expr="impl_color_copy(ident, gecko_ffi_name, complex_color)"></%call>
 % if need_clone:
-    <%call expr="impl_color_clone(ident, gecko_ffi_name, color_flags_ffi_name)"></%call>
+    <%call expr="impl_color_clone(ident, gecko_ffi_name, complex_color)"></%call>
 % endif
 </%def>
 
@@ -645,8 +615,7 @@ fn static_assert() {
     <% impl_keyword("border_%s_style" % side.ident, "mBorderStyle[%s]" % side.index, border_style_keyword,
                     need_clone=True) %>
 
-    <% impl_color("border_%s_color" % side.ident, "mBorderColor[%s]" % side.index,
-                  color_flags_ffi_name="mBorderStyle[%s]" % side.index, need_clone=True) %>
+    <% impl_color("border_%s_color" % side.ident, "(mBorderColor)[%s]" % side.index, need_clone=True) %>
 
     <% impl_app_units("border_%s_width" % side.ident, "mComputedBorder.%s" % side.ident, need_clone=True,
                       round_to_pixels=True) %>
@@ -752,7 +721,7 @@ fn static_assert() {
 
     <% impl_keyword("outline_style", "mOutlineStyle", border_style_keyword, need_clone=True) %>
 
-    <% impl_color("outline_color", "mOutlineColor", color_flags_ffi_name="mOutlineStyle", need_clone=True) %>
+    <% impl_color("outline_color", "mOutlineColor", need_clone=True) %>
 
     <% impl_app_units("outline_width", "mActualOutlineWidth", need_clone=True,
                       round_to_pixels=True) %>
@@ -1365,7 +1334,7 @@ fn static_assert() {
                   skip_longhands="${skip_background_longhands}"
                   skip_additionals="*">
 
-    <% impl_color("background_color", "mBackgroundColor", need_clone=True) %>
+    <% impl_color("background_color", "mBackgroundColor", need_clone=True, complex_color=False) %>
 
     <% impl_common_image_layer_properties("background") %>
 
@@ -1569,8 +1538,7 @@ fn static_assert() {
                   skip_longhands="text-decoration-color text-decoration-line"
                   skip_additionals="*">
 
-    ${impl_color("text_decoration_color", "mTextDecorationColor",
-                  color_flags_ffi_name="mTextDecorationStyle", need_clone=True)}
+    ${impl_color("text_decoration_color", "mTextDecorationColor", need_clone=True)}
 
     pub fn set_text_decoration_line(&mut self, v: longhands::text_decoration_line::computed_value::T) {
         let mut bits: u8 = 0;
@@ -1614,11 +1582,11 @@ clip-path
                   skip_longhands="${skip_svg_longhands}"
                   skip_additionals="*">
 
-    <% impl_color("flood_color", "mFloodColor") %>
+    <% impl_color("flood_color", "mFloodColor", complex_color=False) %>
 
-    <% impl_color("lighting_color", "mLightingColor") %>
+    <% impl_color("lighting_color", "mLightingColor", complex_color=False) %>
 
-    <% impl_color("stop_color", "mStopColor") %>
+    <% impl_color("stop_color", "mStopColor", complex_color=False) %>
 
     <% impl_common_image_layer_properties("mask") %>