servo: Merge #14224 - Regenerate bindings (from heycam:bindings-update-6); r=shinglyu
authorCameron McCormack <cam@mcc.id.au>
Tue, 15 Nov 2016 04:41:44 -0600
changeset 340157 08012d65dba49870c76553dfb1d30250b37f9496
parent 340156 19d15bff5d6a3fa9b15527404778a4e822c1d567
child 340158 0a5eae76e3c8a50f0d2b172fe63ffcdd52f3d1e5
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshinglyu
servo: Merge #14224 - Regenerate bindings (from heycam:bindings-update-6); r=shinglyu <!-- Please describe your changes on the following line: --> r? @shinglyu The oldest commit is from #14220 which hasn't merged yet. The second commit is the update for the sync: https://treeherder.mozilla.org/#/jobs?repo=stylo&revision=88d68e17f03c1f8b9f688081902a3369ea83e627 The newest commit is just regenerating bindings again with an updated rust-bindgen (since the previous few bindings updates were done with an old rust-bindgen). I ran `./mach test-stylo` and all the tests pass. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 969c7ec06fa51226ae97a9b1f066e3d0da48e536
servo/components/style/gecko_bindings/bindings.rs
servo/components/style/gecko_bindings/structs_debug.rs
servo/components/style/gecko_bindings/structs_release.rs
--- a/servo/components/style/gecko_bindings/bindings.rs
+++ b/servo/components/style/gecko_bindings/bindings.rs
@@ -911,16 +911,20 @@ extern "C" {
 }
 extern "C" {
     pub fn Gecko_Destroy_nsStyleEffects(ptr: *mut nsStyleEffects);
 }
 extern "C" {
     pub fn Servo_Node_ClearNodeData(node: RawGeckoNodeBorrowed);
 }
 extern "C" {
+    pub fn Servo_StyleSheet_Empty(parsing_mode: SheetParsingMode)
+     -> RawServoStyleSheetStrong;
+}
+extern "C" {
     pub fn Servo_StyleSheet_FromUTF8Bytes(data: *const nsACString_internal,
                                           parsing_mode: SheetParsingMode,
                                           base_url:
                                               *const nsACString_internal,
                                           base: *mut ThreadSafeURIHolder,
                                           referrer: *mut ThreadSafeURIHolder,
                                           principal:
                                               *mut ThreadSafePrincipalHolder)
--- a/servo/components/style/gecko_bindings/structs_debug.rs
+++ b/servo/components/style/gecko_bindings/structs_debug.rs
@@ -2,17 +2,16 @@
 
 use atomic_refcell::AtomicRefCell;
 use data::ElementData;
 pub use nsstring::nsStringRepr as nsString;
 pub type ServoUnsafeCell<T> = ::std::cell::UnsafeCell<T>;
 pub type ServoCell<T> = ::std::cell::Cell<T>;
 pub type ServoNodeData = AtomicRefCell<ElementData>;
 
-#[derive(Debug)]
 #[repr(C)]
 pub struct __BindgenUnionField<T>(::std::marker::PhantomData<T>);
 impl <T> __BindgenUnionField<T> {
     #[inline]
     pub fn new() -> Self { __BindgenUnionField(::std::marker::PhantomData) }
     #[inline]
     pub unsafe fn as_ref(&self) -> &T { ::std::mem::transmute(self) }
     #[inline]
@@ -22,16 +21,21 @@ impl <T> ::std::default::Default for __B
     #[inline]
     fn default() -> Self { Self::new() }
 }
 impl <T> ::std::clone::Clone for __BindgenUnionField<T> {
     #[inline]
     fn clone(&self) -> Self { Self::new() }
 }
 impl <T> ::std::marker::Copy for __BindgenUnionField<T> { }
+impl <T> ::std::fmt::Debug for __BindgenUnionField<T> {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        fmt.write_str("__BindgenUnionField")
+    }
+}
 pub const NS_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
 pub const NS_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
 pub const NS_FONT_WEIGHT_THIN: ::std::os::raw::c_uint = 100;
 pub const NS_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
 pub const NS_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
@@ -49,61 +53,23 @@ pub const NS_FONT_KERNING_NONE: ::std::o
 pub const NS_FONT_KERNING_NORMAL: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_SYNTHESIS_WEIGHT: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_SYNTHESIS_STYLE: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_DISPLAY_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_DISPLAY_BLOCK: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_DISPLAY_SWAP: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_DISPLAY_FALLBACK: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_DISPLAY_OPTIONAL: ::std::os::raw::c_uint = 4;
-pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_STYLESET: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT: ::std::os::raw::c_uint
-          =
-    1;
-pub const NS_FONT_VARIANT_ALTERNATES_SWASH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_CAPS_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_CAPS_SMALLCAPS: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_CAPS_ALLSMALL: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_CAPS_PETITECAPS: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_VARIANT_CAPS_ALLPETITE: ::std::os::raw::c_uint = 4;
 pub const NS_FONT_VARIANT_CAPS_TITLING: ::std::os::raw::c_uint = 5;
 pub const NS_FONT_VARIANT_CAPS_UNICASE: ::std::os::raw::c_uint = 6;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NONE: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_COMMON: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_LINING: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_TABULAR: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_ORDINAL: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_POSITION_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_POSITION_SUPER: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_POSITION_SUB: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_WIDTH_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_WIDTH_FULL: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_WIDTH_HALF: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_WIDTH_THIRD: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_VARIANT_WIDTH_QUARTER: ::std::os::raw::c_uint = 4;
@@ -288,21 +254,21 @@ pub const NS_STYLE_SPEECH_RATE_SLOWER: :
 pub const NS_STYLE_VOLUME_SILENT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_VOLUME_X_SOFT: ::std::os::raw::c_uint = 1;
 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_INHERIT_FROM_BODY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_WILL_CHANGE_STACKING_CONTEXT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_TRANSFORM: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_SCROLL: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_OPACITY: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_WILL_CHANGE_TRANSFORM: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_WILL_CHANGE_SCROLL: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_WILL_CHANGE_OPACITY: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB: ::std::os::raw::c_uint = 16;
+pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB: ::std::os::raw::c_uint = 32;
 pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE: ::std::os::raw::c_uint
           =
     0;
 pub const NS_STYLE_ANIMATION_PLAY_STATE_RUNNING: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ANIMATION_PLAY_STATE_PAUSED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_SCROLL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_FIXED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_LOCAL: ::std::os::raw::c_uint = 2;
@@ -312,20 +278,20 @@ pub const NS_STYLE_IMAGELAYER_CLIP_CONTE
 pub const NS_STYLE_IMAGELAYER_CLIP_TEXT: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_IMAGELAYER_CLIP_MOZ_ALMOST_PADDING: ::std::os::raw::c_uint
           =
     127;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_BORDER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_PADDING: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_CONTENT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_IMAGELAYER_POSITION_CENTER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_TOP: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_IMAGELAYER_POSITION_TOP: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_X: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_Y: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_IMAGELAYER_REPEAT_SPACE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_IMAGELAYER_REPEAT_ROUND: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1;
@@ -399,21 +365,24 @@ pub const NS_STYLE_CURSOR_NS_RESIZE: ::s
 pub const NS_STYLE_CURSOR_EW_RESIZE: ::std::os::raw::c_uint = 35;
 pub const NS_STYLE_CURSOR_NONE: ::std::os::raw::c_uint = 36;
 pub const NS_STYLE_DIRECTION_LTR: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_DIRECTION_RTL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WRITING_MODE_HORIZONTAL_TB: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_WRITING_MODE_VERTICAL_RL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WRITING_MODE_VERTICAL_LR: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_WRITING_MODE_SIDEWAYS_MASK: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_WRITING_MODE_SIDEWAYS_RL: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_WRITING_MODE_SIDEWAYS_LR: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_CONTAIN_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_CONTAIN_STRICT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_CONTAIN_LAYOUT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_CONTAIN_STYLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_CONTAIN_PAINT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_CONTAIN_ALL_BITS: ::std::os::raw::c_uint = 14;
 pub const NS_STYLE_ALIGN_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ALIGN_NORMAL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_ALIGN_START: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ALIGN_END: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_ALIGN_FLEX_START: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_ALIGN_FLEX_END: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_ALIGN_CENTER: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_ALIGN_LEFT: ::std::os::raw::c_uint = 7;
@@ -427,48 +396,90 @@ pub const NS_STYLE_ALIGN_SPACE_BETWEEN: 
 pub const NS_STYLE_ALIGN_SPACE_AROUND: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_ALIGN_SPACE_EVENLY: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_ALIGN_LEGACY: ::std::os::raw::c_uint = 32;
 pub const NS_STYLE_ALIGN_SAFE: ::std::os::raw::c_uint = 64;
 pub const NS_STYLE_ALIGN_UNSAFE: ::std::os::raw::c_uint = 128;
 pub const NS_STYLE_ALIGN_FLAG_BITS: ::std::os::raw::c_uint = 224;
 pub const NS_STYLE_ALIGN_ALL_BITS: ::std::os::raw::c_uint = 255;
 pub const NS_STYLE_ALIGN_ALL_SHIFT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_JUSTIFY_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_JUSTIFY_NORMAL: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_JUSTIFY_START: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_JUSTIFY_END: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_JUSTIFY_FLEX_START: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_JUSTIFY_FLEX_END: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_JUSTIFY_CENTER: ::std::os::raw::c_uint = 6;
+pub const NS_STYLE_JUSTIFY_LEFT: ::std::os::raw::c_uint = 7;
+pub const NS_STYLE_JUSTIFY_RIGHT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_JUSTIFY_BASELINE: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_JUSTIFY_LAST_BASELINE: ::std::os::raw::c_uint = 10;
+pub const NS_STYLE_JUSTIFY_STRETCH: ::std::os::raw::c_uint = 11;
+pub const NS_STYLE_JUSTIFY_SELF_START: ::std::os::raw::c_uint = 12;
+pub const NS_STYLE_JUSTIFY_SELF_END: ::std::os::raw::c_uint = 13;
+pub const NS_STYLE_JUSTIFY_SPACE_BETWEEN: ::std::os::raw::c_uint = 14;
+pub const NS_STYLE_JUSTIFY_SPACE_AROUND: ::std::os::raw::c_uint = 15;
+pub const NS_STYLE_JUSTIFY_SPACE_EVENLY: ::std::os::raw::c_uint = 16;
+pub const NS_STYLE_JUSTIFY_LEGACY: ::std::os::raw::c_uint = 32;
+pub const NS_STYLE_JUSTIFY_SAFE: ::std::os::raw::c_uint = 64;
+pub const NS_STYLE_JUSTIFY_UNSAFE: ::std::os::raw::c_uint = 128;
+pub const NS_STYLE_JUSTIFY_FLAG_BITS: ::std::os::raw::c_uint = 224;
+pub const NS_STYLE_JUSTIFY_ALL_BITS: ::std::os::raw::c_uint = 255;
+pub const NS_STYLE_JUSTIFY_ALL_SHIFT: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FLEX_DIRECTION_ROW: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FLEX_DIRECTION_ROW_REVERSE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FLEX_DIRECTION_COLUMN: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FLEX_WRAP_NOWRAP: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FLEX_WRAP_WRAP: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FLEX_WRAP_WRAP_REVERSE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ORDER_INITIAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_START: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_END: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_JUSTIFY_CONTENT_CENTER: ::std::os::raw::c_uint = 6;
+pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN: ::std::os::raw::c_uint = 14;
+pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_FILTER_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FILTER_URL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FILTER_BLUR: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FILTER_BRIGHTNESS: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FILTER_CONTRAST: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FILTER_GRAYSCALE: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FILTER_INVERT: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FILTER_OPACITY: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FILTER_SATURATE: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FILTER_SEPIA: ::std::os::raw::c_uint = 9;
 pub const NS_STYLE_FILTER_HUE_ROTATE: ::std::os::raw::c_uint = 10;
 pub const NS_STYLE_FILTER_DROP_SHADOW: ::std::os::raw::c_uint = 11;
+pub const NS_STYLE_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
+pub const NS_STYLE_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
 pub const NS_STYLE_FONT_WEIGHT_BOLDER: ::std::os::raw::c_int = -1;
 pub const NS_STYLE_FONT_WEIGHT_LIGHTER: ::std::os::raw::c_int = -2;
 pub const NS_STYLE_FONT_SIZE_XXSMALL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FONT_SIZE_XSMALL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FONT_SIZE_SMALL: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FONT_SIZE_MEDIUM: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FONT_SIZE_LARGE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_SIZE_XLARGE: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FONT_SIZE_XXLARGE: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FONT_SIZE_XXXLARGE: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FONT_SIZE_LARGER: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FONT_SIZE_SMALLER: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
+pub const NS_STYLE_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
+pub const NS_STYLE_FONT_STRETCH_CONDENSED: ::std::os::raw::c_int = -2;
+pub const NS_STYLE_FONT_STRETCH_SEMI_CONDENSED: ::std::os::raw::c_int = -1;
+pub const NS_STYLE_FONT_STRETCH_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_FONT_STRETCH_SEMI_EXPANDED: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_FONT_STRETCH_EXPANDED: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_FONT_STRETCH_EXTRA_EXPANDED: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_CAPTION: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FONT_ICON: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FONT_MENU: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FONT_MESSAGE_BOX: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_SMALL_CAPTION: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FONT_STATUS_BAR: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FONT_WINDOW: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FONT_DOCUMENT: ::std::os::raw::c_uint = 8;
@@ -476,18 +487,18 @@ pub const NS_STYLE_FONT_WORKSPACE: ::std
 pub const NS_STYLE_FONT_DESKTOP: ::std::os::raw::c_uint = 10;
 pub const NS_STYLE_FONT_INFO: ::std::os::raw::c_uint = 11;
 pub const NS_STYLE_FONT_DIALOG: ::std::os::raw::c_uint = 12;
 pub const NS_STYLE_FONT_BUTTON: ::std::os::raw::c_uint = 13;
 pub const NS_STYLE_FONT_PULL_DOWN_MENU: ::std::os::raw::c_uint = 14;
 pub const NS_STYLE_FONT_LIST: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_FONT_FIELD: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_GRID_AUTO_FLOW_ROW: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_GRID_AUTO_FLOW_DENSE: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_GRID_AUTO_FLOW_DENSE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_GRID_TEMPLATE_SUBGRID: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_GRID_TRACK_BREADTH_MAX_CONTENT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_GRID_TRACK_BREADTH_MIN_CONTENT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_GRID_REPEAT_AUTO_FILL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_GRID_REPEAT_AUTO_FIT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WIDTH_MAX_CONTENT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_WIDTH_MIN_CONTENT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WIDTH_FIT_CONTENT: ::std::os::raw::c_uint = 2;
@@ -599,35 +610,38 @@ pub const NS_STYLE_TEXT_DECORATION_LINE_
 pub const NS_STYLE_TEXT_DECORATION_LINE_OVERLINE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH: ::std::os::raw::c_uint =
     4;
 pub const NS_STYLE_TEXT_DECORATION_LINE_BLINK: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS: ::std::os::raw::c_uint =
     16;
 pub const NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL: ::std::os::raw::c_uint =
     32;
+pub const NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK: ::std::os::raw::c_uint =
+    7;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DOTTED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DASHED: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_SOLID: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_WAVY: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_TEXT_DECORATION_STYLE_MAX: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_TEXT_OVERFLOW_CLIP: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_OVERFLOW_ELLIPSIS: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_OVERFLOW_STRING: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_TRANSFORM_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_TRANSFORM_CAPITALIZE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_TRANSFORM_LOWERCASE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_TRANSFORM_UPPERCASE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_TEXT_TRANSFORM_FULL_WIDTH: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TOUCH_ACTION_NONE: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_AUTO: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_PAN_X: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_PAN_Y: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TOUCH_ACTION_AUTO: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_TOUCH_ACTION_PAN_X: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_TOUCH_ACTION_PAN_Y: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_TOP_LAYER_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TOP_LAYER_TOP: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TRANSFORM_BOX_BORDER_BOX: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TRANSFORM_BOX_FILL_BOX: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TRANSFORM_BOX_VIEW_BOX: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE: ::std::os::raw::c_uint =
     0;
 pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_LINEAR: ::std::os::raw::c_uint =
@@ -763,16 +777,17 @@ pub const NS_STYLE_IMAGE_RENDERING_OPTIM
     2;
 pub const NS_STYLE_IMAGE_RENDERING_CRISPEDGES: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_MASK_TYPE_LUMINANCE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_MASK_TYPE_ALPHA: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_PAINT_ORDER_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_PAINT_ORDER_FILL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_PAINT_ORDER_STROKE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_PAINT_ORDER_MARKERS: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_PAINT_ORDER_LAST_VALUE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_PAINT_ORDER_BITWIDTH: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_SHAPE_RENDERING_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_SHAPE_RENDERING_OPTIMIZESPEED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_SHAPE_RENDERING_CRISPEDGES: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_SHAPE_RENDERING_GEOMETRICPRECISION: ::std::os::raw::c_uint
           =
     3;
 pub const NS_STYLE_STROKE_LINECAP_BUTT: ::std::os::raw::c_uint = 0;
@@ -781,23 +796,26 @@ pub const NS_STYLE_STROKE_LINECAP_SQUARE
 pub const NS_STYLE_STROKE_LINEJOIN_MITER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_STROKE_LINEJOIN_ROUND: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_STROKE_LINEJOIN_BEVEL: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_STROKE_PROP_CONTEXT_VALUE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_ANCHOR_START: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_ANCHOR_MIDDLE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_ANCHOR_END: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_EMPHASIS_POSITION_OVER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH: ::std::os::raw::c_uint =
+    10;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_NONE: ::std::os::raw::c_uint = 0;
-pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED: ::std::os::raw::c_uint = 0;
-pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SHAPE_MASK: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE: ::std::os::raw::c_uint =
     3;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_STRING: ::std::os::raw::c_uint = 255;
@@ -867,21 +885,17 @@ pub const NS_STYLE_SCROLL_SNAP_TYPE_MAND
 pub const NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ORIENTATION_PORTRAIT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ORIENTATION_LANDSCAPE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_SCAN_PROGRESSIVE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_SCAN_INTERLACE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_DISPLAY_MODE_BROWSER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_DISPLAY_MODE_STANDALONE: ::std::os::raw::c_uint = 2;
-pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN: ::std::os::raw::c_uint = 3;
-pub const NS_STYLE_INHERIT_BIT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_INHERIT_MASK: ::std::os::raw::c_uint = 16777215;
-pub const NS_STYLE_INHERITED_STRUCT_MASK: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_RESET_STRUCT_MASK: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_HAS_TEXT_DECORATION_LINES: ::std::os::raw::c_uint =
     16777216;
 pub const NS_STYLE_HAS_PSEUDO_ELEMENT_DATA: ::std::os::raw::c_uint = 33554432;
 pub const NS_STYLE_RELEVANT_LINK_VISITED: ::std::os::raw::c_uint = 67108864;
 pub const NS_STYLE_IS_STYLE_IF_VISITED: ::std::os::raw::c_uint = 134217728;
 pub const NS_STYLE_CHILD_USES_GRANDANCESTOR_STYLE: ::std::os::raw::c_uint =
     268435456;
 pub const NS_STYLE_IS_SHARED: ::std::os::raw::c_uint = 536870912;
@@ -1540,40 +1554,38 @@ impl Clone for JSObject {
 pub struct Value {
     pub data: Value_layout,
 }
 pub type Value_PayloadType = u64;
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct Value_layout {
     pub asBits: __BindgenUnionField<u64>,
-    pub debugView: __BindgenUnionField<Value_layout__bindgen_ty_bindgen_id_57099>,
-    pub s: __BindgenUnionField<Value_layout__bindgen_ty_bindgen_id_57105>,
+    pub debugView: __BindgenUnionField<Value_layout__bindgen_ty_1>,
+    pub s: __BindgenUnionField<Value_layout__bindgen_ty_2>,
     pub asDouble: __BindgenUnionField<f64>,
     pub asPtr: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub asWord: __BindgenUnionField<usize>,
     pub asUIntPtr: __BindgenUnionField<usize>,
     pub bindgen_union_field: u64,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_57099 {
+pub struct Value_layout__bindgen_ty_1 {
     pub _bitfield_1: u64,
 }
 #[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_57099() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_57099>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_57099>()
-               , 8usize);
-}
-impl Clone for Value_layout__bindgen_ty_bindgen_id_57099 {
-    fn clone(&self) -> Self { *self }
-}
-impl Value_layout__bindgen_ty_bindgen_id_57099 {
+fn bindgen_test_layout_Value_layout__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_1>() , 8usize);
+}
+impl Clone for Value_layout__bindgen_ty_1 {
+    fn clone(&self) -> Self { *self }
+}
+impl Value_layout__bindgen_ty_1 {
     #[inline]
     pub fn payload47(&self) -> u64 {
         unsafe {
             ::std::mem::transmute(((self._bitfield_1 &
                                         (140737488355327usize as u64)) >>
                                        0u32) as u64)
         }
     }
@@ -1596,46 +1608,43 @@ impl Value_layout__bindgen_ty_bindgen_id
         self._bitfield_1 &= !(18446603336221196288usize as u64);
         self._bitfield_1 |=
             ((val as u32 as u64) << 47u32) &
                 (18446603336221196288usize as u64);
     }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_57105 {
-    pub payload: Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106,
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106 {
+pub struct Value_layout__bindgen_ty_2 {
+    pub payload: Value_layout__bindgen_ty_2_1,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct Value_layout__bindgen_ty_2_1 {
     pub i32: __BindgenUnionField<i32>,
     pub u32: __BindgenUnionField<u32>,
     pub why: __BindgenUnionField<JSWhyMagic>,
     pub bindgen_union_field: u32,
 }
 #[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106>()
-               , 4usize);
-}
-impl Clone for
- Value_layout__bindgen_ty_bindgen_id_57105__bindgen_ty_bindgen_id_57106 {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_57105() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_57105>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_57105>()
-               , 4usize);
-}
-impl Clone for Value_layout__bindgen_ty_bindgen_id_57105 {
+fn bindgen_test_layout_Value_layout__bindgen_ty_2_1() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_2_1>() ,
+               4usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_2_1>() ,
+               4usize);
+}
+impl Clone for Value_layout__bindgen_ty_2_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_Value_layout__bindgen_ty_2() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_2>() , 4usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_2>() , 4usize);
+}
+impl Clone for Value_layout__bindgen_ty_2 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_Value_layout() {
     assert_eq!(::std::mem::size_of::<Value_layout>() , 8usize);
     assert_eq!(::std::mem::align_of::<Value_layout>() , 8usize);
 }
 impl Clone for Value_layout {
@@ -1714,43 +1723,35 @@ pub type nsAString_internal_string_type 
 pub type nsAString_internal_const_iterator = nsReadingIterator<u16>;
 pub type nsAString_internal_iterator = nsWritingIterator<u16>;
 pub type nsAString_internal_comparator_type = nsStringComparator;
 pub type nsAString_internal_char_iterator = *mut nsAString_internal_char_type;
 pub type nsAString_internal_const_char_iterator =
     *const nsAString_internal_char_type;
 pub type nsAString_internal_size_type = u32;
 pub type nsAString_internal_index_type = u32;
-pub const nsAString_internal_F_NONE:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_NONE;
-pub const nsAString_internal_F_TERMINATED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_TERMINATED;
-pub const nsAString_internal_F_VOIDED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_VOIDED;
-pub const nsAString_internal_F_SHARED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_SHARED;
-pub const nsAString_internal_F_OWNED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_OWNED;
-pub const nsAString_internal_F_FIXED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_FIXED;
-pub const nsAString_internal_F_LITERAL:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_LITERAL;
-pub const nsAString_internal_F_CLASS_FIXED:
-          nsAString_internal__bindgen_ty_bindgen_id_71997 =
-    nsAString_internal__bindgen_ty_bindgen_id_71997::F_CLASS_FIXED;
+pub const nsAString_internal_F_NONE: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_NONE;
+pub const nsAString_internal_F_TERMINATED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_TERMINATED;
+pub const nsAString_internal_F_VOIDED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_VOIDED;
+pub const nsAString_internal_F_SHARED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_SHARED;
+pub const nsAString_internal_F_OWNED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_OWNED;
+pub const nsAString_internal_F_FIXED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_FIXED;
+pub const nsAString_internal_F_LITERAL: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_LITERAL;
+pub const nsAString_internal_F_CLASS_FIXED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_CLASS_FIXED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsAString_internal__bindgen_ty_bindgen_id_71997 {
+pub enum nsAString_internal__bindgen_ty_1 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
     F_SHARED = 4,
     F_OWNED = 8,
     F_FIXED = 16,
     F_LITERAL = 32,
     F_CLASS_FIXED = 65536,
@@ -1777,22 +1778,22 @@ pub type nsSubstringTuple_size_type = u3
 fn bindgen_test_layout_nsSubstringTuple() {
     assert_eq!(::std::mem::size_of::<nsSubstringTuple>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsSubstringTuple>() , 8usize);
 }
 impl Clone for nsSubstringTuple {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_72607 {
+pub struct nsStringComparator__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_72607,
+    pub vtable_: *const nsStringComparator__bindgen_vtable,
 }
 pub type nsStringComparator_char_type = u16;
 #[test]
 fn bindgen_test_layout_nsStringComparator() {
     assert_eq!(::std::mem::size_of::<nsStringComparator>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsStringComparator>() , 8usize);
 }
 impl Clone for nsStringComparator {
@@ -1822,43 +1823,37 @@ pub type nsACString_internal_iterator =
     nsWritingIterator<::std::os::raw::c_char>;
 pub type nsACString_internal_comparator_type = nsCStringComparator;
 pub type nsACString_internal_char_iterator =
     *mut nsACString_internal_char_type;
 pub type nsACString_internal_const_char_iterator =
     *const nsACString_internal_char_type;
 pub type nsACString_internal_size_type = u32;
 pub type nsACString_internal_index_type = u32;
-pub const nsACString_internal_F_NONE:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_NONE;
-pub const nsACString_internal_F_TERMINATED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_TERMINATED;
-pub const nsACString_internal_F_VOIDED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_VOIDED;
-pub const nsACString_internal_F_SHARED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_SHARED;
-pub const nsACString_internal_F_OWNED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_OWNED;
-pub const nsACString_internal_F_FIXED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_FIXED;
-pub const nsACString_internal_F_LITERAL:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_LITERAL;
-pub const nsACString_internal_F_CLASS_FIXED:
-          nsACString_internal__bindgen_ty_bindgen_id_73837 =
-    nsACString_internal__bindgen_ty_bindgen_id_73837::F_CLASS_FIXED;
+pub const nsACString_internal_F_NONE: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_NONE;
+pub const nsACString_internal_F_TERMINATED: nsACString_internal__bindgen_ty_1
+          =
+    nsACString_internal__bindgen_ty_1::F_TERMINATED;
+pub const nsACString_internal_F_VOIDED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_VOIDED;
+pub const nsACString_internal_F_SHARED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_SHARED;
+pub const nsACString_internal_F_OWNED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_OWNED;
+pub const nsACString_internal_F_FIXED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_FIXED;
+pub const nsACString_internal_F_LITERAL: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_LITERAL;
+pub const nsACString_internal_F_CLASS_FIXED: nsACString_internal__bindgen_ty_1
+          =
+    nsACString_internal__bindgen_ty_1::F_CLASS_FIXED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsACString_internal__bindgen_ty_bindgen_id_73837 {
+pub enum nsACString_internal__bindgen_ty_1 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
     F_SHARED = 4,
     F_OWNED = 8,
     F_FIXED = 16,
     F_LITERAL = 32,
     F_CLASS_FIXED = 65536,
@@ -1910,45 +1905,45 @@ impl Clone for nsCString_Segment {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsCString() {
     assert_eq!(::std::mem::size_of::<nsCString>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsCString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_74389 {
+pub struct nsCStringComparator__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_74389,
+    pub vtable_: *const nsCStringComparator__bindgen_vtable,
 }
 pub type nsCStringComparator_char_type = ::std::os::raw::c_char;
 #[test]
 fn bindgen_test_layout_nsCStringComparator() {
     assert_eq!(::std::mem::size_of::<nsCStringComparator>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsCStringComparator>() , 8usize);
 }
 impl Clone for nsCStringComparator {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_74693 {
+pub struct nsISupports__bindgen_vtable {
 }
 /**
  * Basic component object model interface. Objects which implement
  * this interface support runtime interface discovery (QueryInterface)
  * and a reference counted memory model (AddRef/Release). This is
  * modelled after the win32 IUnknown API.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsISupports {
-    pub vtable_: *const bindgen_vtable__bindgen_id_74693,
+    pub vtable_: *const nsISupports__bindgen_vtable,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsISupports_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
@@ -1956,25 +1951,25 @@ pub struct nsISupports_COMTypeInfo<T, U>
 fn bindgen_test_layout_nsISupports() {
     assert_eq!(::std::mem::size_of::<nsISupports>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsISupports>() , 8usize);
 }
 impl Clone for nsISupports {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_74977 {
+pub struct nsCycleCollectionParticipant__bindgen_vtable {
 }
 /**
  * Participant implementation classes
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCycleCollectionParticipant {
-    pub vtable_: *const bindgen_vtable__bindgen_id_74977,
+    pub vtable_: *const nsCycleCollectionParticipant__bindgen_vtable,
     pub mMightSkip: bool,
 }
 #[test]
 fn bindgen_test_layout_nsCycleCollectionParticipant() {
     assert_eq!(::std::mem::size_of::<nsCycleCollectionParticipant>() ,
                16usize);
     assert_eq!(::std::mem::align_of::<nsCycleCollectionParticipant>() ,
                8usize);
@@ -2243,17 +2238,17 @@ fn bindgen_test_layout_ErrorResult() {
  * A cleanup policy consists of two booleans: whether to assert that we've been
  * reported or suppressed, and whether to then go ahead and suppress the
  * exception.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct TErrorResult<CleanupPolicy> {
     pub mResult: nsresult,
-    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_82639<CleanupPolicy>,
+    pub __bindgen_anon_1: TErrorResult__bindgen_ty_1<CleanupPolicy>,
     pub mMightHaveUnreportedJSException: bool,
     pub mUnionState: TErrorResult_UnionState,
     pub _mOwningThread: nsAutoOwningThread,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 pub const TErrorResult_UnionState_HasDOMExceptionInfo: TErrorResult_UnionState
           =
     TErrorResult_UnionState::HasMessage;
@@ -2273,17 +2268,17 @@ pub struct TErrorResult_Message<CleanupP
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct TErrorResult_DOMExceptionInfo<CleanupPolicy> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct TErrorResult__bindgen_ty_bindgen_id_82639<CleanupPolicy> {
+pub struct TErrorResult__bindgen_ty_1<CleanupPolicy> {
     pub mMessage: __BindgenUnionField<*mut TErrorResult_Message<CleanupPolicy>>,
     pub mJSException: __BindgenUnionField<Value>,
     pub mDOMExceptionInfo: __BindgenUnionField<*mut TErrorResult_DOMExceptionInfo<CleanupPolicy>>,
     pub bindgen_union_field: u64,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
@@ -2431,31 +2426,27 @@ pub struct nsIPrincipal {
 }
 #[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>,
 }
-pub const nsIPrincipal_APP_STATUS_NOT_INSTALLED:
-          nsIPrincipal__bindgen_ty_bindgen_id_83869 =
-    nsIPrincipal__bindgen_ty_bindgen_id_83869::APP_STATUS_NOT_INSTALLED;
-pub const nsIPrincipal_APP_STATUS_INSTALLED:
-          nsIPrincipal__bindgen_ty_bindgen_id_83869 =
-    nsIPrincipal__bindgen_ty_bindgen_id_83869::APP_STATUS_INSTALLED;
-pub const nsIPrincipal_APP_STATUS_PRIVILEGED:
-          nsIPrincipal__bindgen_ty_bindgen_id_83869 =
-    nsIPrincipal__bindgen_ty_bindgen_id_83869::APP_STATUS_PRIVILEGED;
-pub const nsIPrincipal_APP_STATUS_CERTIFIED:
-          nsIPrincipal__bindgen_ty_bindgen_id_83869 =
-    nsIPrincipal__bindgen_ty_bindgen_id_83869::APP_STATUS_CERTIFIED;
+pub const nsIPrincipal_APP_STATUS_NOT_INSTALLED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_NOT_INSTALLED;
+pub const nsIPrincipal_APP_STATUS_INSTALLED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_INSTALLED;
+pub const nsIPrincipal_APP_STATUS_PRIVILEGED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_PRIVILEGED;
+pub const nsIPrincipal_APP_STATUS_CERTIFIED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_CERTIFIED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPrincipal__bindgen_ty_bindgen_id_83869 {
+pub enum nsIPrincipal__bindgen_ty_1 {
     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);
@@ -2480,17 +2471,17 @@ pub struct nsISerializable_COMTypeInfo<T
 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_84037 {
+pub struct nsWrapperCache__bindgen_vtable {
 }
 /**
  * Class to store the wrapper for an object. This can only be used with objects
  * that only have one non-security wrapper at a time (for an XPCWrappedNative
  * this is usually ensured by setting an explicit parent in the PreCreate hook
  * for the class).
  *
  * An instance of nsWrapperCache can be gotten from an object that implements
@@ -2522,67 +2513,59 @@ pub struct bindgen_vtable__bindgen_id_84
  *
  * A number of the methods are implemented in nsWrapperCacheInlines.h because we
  * have to include some JS headers that don't play nicely with the rest of the
  * codebase. Include nsWrapperCacheInlines.h if you need to call those methods.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsWrapperCache {
-    pub vtable_: *const bindgen_vtable__bindgen_id_84037,
+    pub vtable_: *const nsWrapperCache__bindgen_vtable,
     pub mWrapper: *mut JSObject,
     pub mFlags: nsWrapperCache_FlagsType,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsWrapperCache_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub type nsWrapperCache_FlagsType = u32;
-pub const nsWrapperCache_WRAPPER_BIT_PRESERVED:
-          nsWrapperCache__bindgen_ty_bindgen_id_84244 =
-    nsWrapperCache__bindgen_ty_bindgen_id_84244::WRAPPER_BIT_PRESERVED;
+pub const nsWrapperCache_WRAPPER_BIT_PRESERVED: nsWrapperCache__bindgen_ty_1 =
+    nsWrapperCache__bindgen_ty_1::WRAPPER_BIT_PRESERVED;
 #[repr(u32)]
 /**
    * If this bit is set then we're preserving the wrapper, which in effect ties
    * the lifetime of the JS object stored in the cache to the lifetime of the
    * native object. We rely on the cycle collector to break the cycle that this
    * causes between the native object and the JS object, so it is important that
    * any native object that supports preserving of its wrapper
    * traces/traverses/unlinks the cached JS object (see
    * NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER,
    * NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS and
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_84244 {
-    WRAPPER_BIT_PRESERVED = 1,
-}
+pub enum nsWrapperCache__bindgen_ty_1 { WRAPPER_BIT_PRESERVED = 1, }
 pub const nsWrapperCache_WRAPPER_IS_NOT_DOM_BINDING:
-          nsWrapperCache__bindgen_ty_bindgen_id_84247 =
-    nsWrapperCache__bindgen_ty_bindgen_id_84247::WRAPPER_IS_NOT_DOM_BINDING;
+          nsWrapperCache__bindgen_ty_2 =
+    nsWrapperCache__bindgen_ty_2::WRAPPER_IS_NOT_DOM_BINDING;
 #[repr(u32)]
 /**
    * If this bit is set then the wrapper for the native object is not a DOM
    * binding.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_84247 {
-    WRAPPER_IS_NOT_DOM_BINDING = 2,
-}
-pub const nsWrapperCache_kWrapperFlagsMask:
-          nsWrapperCache__bindgen_ty_bindgen_id_84250 =
-    nsWrapperCache__bindgen_ty_bindgen_id_84250::kWrapperFlagsMask;
+pub enum nsWrapperCache__bindgen_ty_2 { WRAPPER_IS_NOT_DOM_BINDING = 2, }
+pub const nsWrapperCache_kWrapperFlagsMask: nsWrapperCache__bindgen_ty_3 =
+    nsWrapperCache__bindgen_ty_3::kWrapperFlagsMask;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_84250 {
-    kWrapperFlagsMask = 3,
-}
+pub enum nsWrapperCache__bindgen_ty_3 { kWrapperFlagsMask = 3, }
 #[test]
 fn bindgen_test_layout_nsWrapperCache() {
     assert_eq!(::std::mem::size_of::<nsWrapperCache>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsWrapperCache>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct AllOwningUnionBase {
@@ -2647,33 +2630,33 @@ impl Clone for nsXPCOMCycleCollectionPar
 #[derive(Debug, Copy, Clone)]
 pub struct pair<_T1, _T2> {
     pub first: _T1,
     pub second: _T2,
 }
 pub type pair_first_type<_T1> = _T1;
 pub type pair_second_type<_T2> = _T2;
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_132951 {
+pub struct SourceHook__bindgen_vtable {
 }
 /**
  * A class of objects that return source code on demand.
  *
  * When code is compiled with setSourceIsLazy(true), SpiderMonkey doesn't
  * retain the source code (and doesn't do lazy bytecode generation). If we ever
  * need the source code, say, in response to a call to Function.prototype.
  * toSource or Debugger.Source.prototype.text, then we call the 'load' member
  * function of the instance of this class that has hopefully been registered
  * with the runtime, passing the code's URL, and hope that it will be able to
  * find the source.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct SourceHook {
-    pub vtable_: *const bindgen_vtable__bindgen_id_132951,
+    pub vtable_: *const SourceHook__bindgen_vtable,
 }
 #[test]
 fn bindgen_test_layout_SourceHook() {
     assert_eq!(::std::mem::size_of::<SourceHook>() , 8usize);
     assert_eq!(::std::mem::align_of::<SourceHook>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -3652,17 +3635,17 @@ impl nsIDocument {
 pub struct nsINode {
     pub _base: EventTarget,
     pub mNodeInfo: RefPtr<NodeInfo>,
     pub mParent: *mut nsINode,
     pub mBoolFlags: u32,
     pub mNextSibling: *mut nsIContent,
     pub mPreviousSibling: *mut nsIContent,
     pub mFirstChild: *mut nsIContent,
-    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_143536,
+    pub __bindgen_anon_1: nsINode__bindgen_ty_1,
     pub mSlots: *mut nsINode_nsSlots,
     pub mServoData: ServoCell<*mut ServoNodeData>,
 }
 pub type nsINode_BoxQuadOptions = BoxQuadOptions;
 pub type nsINode_ConvertCoordinateOptions = ConvertCoordinateOptions;
 pub type nsINode_DOMPoint = DOMPoint;
 pub type nsINode_DOMPointInit = DOMPointInit;
 pub type nsINode_DOMQuad = DOMQuad;
@@ -3672,67 +3655,65 @@ pub type nsINode_TextOrElementOrDocument
 pub type nsINode_ErrorResult = ErrorResult;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsINode_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsINode_eCONTENT: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eCONTENT;
-pub const nsINode_eDOCUMENT: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eDOCUMENT;
-pub const nsINode_eATTRIBUTE: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eATTRIBUTE;
-pub const nsINode_eTEXT: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eTEXT;
-pub const nsINode_ePROCESSING_INSTRUCTION:
-          nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::ePROCESSING_INSTRUCTION;
-pub const nsINode_eCOMMENT: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eCOMMENT;
-pub const nsINode_eHTML_FORM_CONTROL: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eHTML_FORM_CONTROL;
-pub const nsINode_eDOCUMENT_FRAGMENT: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eDOCUMENT_FRAGMENT;
-pub const nsINode_eDATA_NODE: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eDATA_NODE;
-pub const nsINode_eMEDIA: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eMEDIA;
-pub const nsINode_eANIMATION: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eANIMATION;
-pub const nsINode_eFILTER: nsINode__bindgen_ty_bindgen_id_139605 =
-    nsINode__bindgen_ty_bindgen_id_139605::eFILTER;
+pub const nsINode_eCONTENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eCONTENT;
+pub const nsINode_eDOCUMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDOCUMENT;
+pub const nsINode_eATTRIBUTE: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eATTRIBUTE;
+pub const nsINode_eTEXT: nsINode__bindgen_ty_2 = nsINode__bindgen_ty_2::eTEXT;
+pub const nsINode_ePROCESSING_INSTRUCTION: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::ePROCESSING_INSTRUCTION;
+pub const nsINode_eCOMMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eCOMMENT;
+pub const nsINode_eHTML_FORM_CONTROL: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eHTML_FORM_CONTROL;
+pub const nsINode_eDOCUMENT_FRAGMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDOCUMENT_FRAGMENT;
+pub const nsINode_eDATA_NODE: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDATA_NODE;
+pub const nsINode_eMEDIA: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eMEDIA;
+pub const nsINode_eANIMATION: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eANIMATION;
+pub const nsINode_eFILTER: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eFILTER;
 #[repr(u32)]
 /**
    * Bit-flags to pass (or'ed together) to IsNodeOfType()
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsINode__bindgen_ty_bindgen_id_139605 {
+pub enum nsINode__bindgen_ty_2 {
     eCONTENT = 1,
     eDOCUMENT = 2,
     eATTRIBUTE = 4,
     eTEXT = 8,
     ePROCESSING_INSTRUCTION = 16,
     eCOMMENT = 32,
     eHTML_FORM_CONTROL = 64,
     eDOCUMENT_FRAGMENT = 128,
     eDATA_NODE = 256,
     eMEDIA = 512,
     eANIMATION = 1024,
     eFILTER = 2048,
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_140374 {
+pub struct nsINode_nsSlots__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsINode_nsSlots {
-    pub vtable_: *const bindgen_vtable__bindgen_id_140374,
+    pub vtable_: *const nsINode_nsSlots__bindgen_vtable,
     /**
      * A list of mutation observers
      */
     pub mMutationObservers: [u64; 2usize],
     /**
      * An object implementing nsIDOMNodeList for this content (childNodes)
      * @see nsIDOMNodeList
      * @see nsGenericHTMLElement::GetChildNodes
@@ -3791,29 +3772,27 @@ pub enum nsINode_BooleanFlag {
     NodeHasRelevantHoverRules = 28,
     ElementHasWeirdParserInsertionMode = 29,
     ParserHasNotified = 30,
     MayBeApzAware = 31,
     BooleanFlagCount = 32,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsINode__bindgen_ty_bindgen_id_143536 {
+pub struct nsINode__bindgen_ty_1 {
     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_143536() {
-    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_143536>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_143536>()
-               , 8usize);
-}
-impl Clone for nsINode__bindgen_ty_bindgen_id_143536 {
+fn bindgen_test_layout_nsINode__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsINode__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsINode() {
     assert_eq!(::std::mem::size_of::<nsINode>() , 104usize);
     assert_eq!(::std::mem::align_of::<nsINode>() , 8usize);
 }
 #[repr(C)]
@@ -4158,83 +4137,74 @@ pub struct nsIDOMNode {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIDOMNode_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIDOMNode_ELEMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::ELEMENT_NODE;
-pub const nsIDOMNode_ATTRIBUTE_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835
-          =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::ATTRIBUTE_NODE;
-pub const nsIDOMNode_TEXT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::TEXT_NODE;
-pub const nsIDOMNode_CDATA_SECTION_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::CDATA_SECTION_NODE;
-pub const nsIDOMNode_ENTITY_REFERENCE_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::ENTITY_REFERENCE_NODE;
-pub const nsIDOMNode_ENTITY_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::ENTITY_NODE;
-pub const nsIDOMNode_PROCESSING_INSTRUCTION_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::PROCESSING_INSTRUCTION_NODE;
-pub const nsIDOMNode_COMMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::COMMENT_NODE;
-pub const nsIDOMNode_DOCUMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::DOCUMENT_NODE;
-pub const nsIDOMNode_DOCUMENT_TYPE_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::DOCUMENT_TYPE_NODE;
-pub const nsIDOMNode_DOCUMENT_FRAGMENT_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::DOCUMENT_FRAGMENT_NODE;
-pub const nsIDOMNode_NOTATION_NODE: nsIDOMNode__bindgen_ty_bindgen_id_151835 =
-    nsIDOMNode__bindgen_ty_bindgen_id_151835::NOTATION_NODE;
+pub const nsIDOMNode_ELEMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ELEMENT_NODE;
+pub const nsIDOMNode_ATTRIBUTE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ATTRIBUTE_NODE;
+pub const nsIDOMNode_TEXT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::TEXT_NODE;
+pub const nsIDOMNode_CDATA_SECTION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::CDATA_SECTION_NODE;
+pub const nsIDOMNode_ENTITY_REFERENCE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ENTITY_REFERENCE_NODE;
+pub const nsIDOMNode_ENTITY_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ENTITY_NODE;
+pub const nsIDOMNode_PROCESSING_INSTRUCTION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::PROCESSING_INSTRUCTION_NODE;
+pub const nsIDOMNode_COMMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::COMMENT_NODE;
+pub const nsIDOMNode_DOCUMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_NODE;
+pub const nsIDOMNode_DOCUMENT_TYPE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_TYPE_NODE;
+pub const nsIDOMNode_DOCUMENT_FRAGMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_FRAGMENT_NODE;
+pub const nsIDOMNode_NOTATION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::NOTATION_NODE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_151835 {
+pub enum nsIDOMNode__bindgen_ty_1 {
     ELEMENT_NODE = 1,
     ATTRIBUTE_NODE = 2,
     TEXT_NODE = 3,
     CDATA_SECTION_NODE = 4,
     ENTITY_REFERENCE_NODE = 5,
     ENTITY_NODE = 6,
     PROCESSING_INSTRUCTION_NODE = 7,
     COMMENT_NODE = 8,
     DOCUMENT_NODE = 9,
     DOCUMENT_TYPE_NODE = 10,
     DOCUMENT_FRAGMENT_NODE = 11,
     NOTATION_NODE = 12,
 }
-pub const nsIDOMNode_DOCUMENT_POSITION_DISCONNECTED:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_DISCONNECTED;
-pub const nsIDOMNode_DOCUMENT_POSITION_PRECEDING:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_PRECEDING;
-pub const nsIDOMNode_DOCUMENT_POSITION_FOLLOWING:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_FOLLOWING;
-pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINS:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_CONTAINS;
-pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINED_BY:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_CONTAINED_BY;
+pub const nsIDOMNode_DOCUMENT_POSITION_DISCONNECTED: nsIDOMNode__bindgen_ty_2
+          =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_DISCONNECTED;
+pub const nsIDOMNode_DOCUMENT_POSITION_PRECEDING: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_PRECEDING;
+pub const nsIDOMNode_DOCUMENT_POSITION_FOLLOWING: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_FOLLOWING;
+pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINS: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_CONTAINS;
+pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINED_BY: nsIDOMNode__bindgen_ty_2
+          =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_CONTAINED_BY;
 pub const nsIDOMNode_DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC:
-          nsIDOMNode__bindgen_ty_bindgen_id_152054 =
-    nsIDOMNode__bindgen_ty_bindgen_id_152054::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
+          nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_152054 {
+pub enum nsIDOMNode__bindgen_ty_2 {
     DOCUMENT_POSITION_DISCONNECTED = 1,
     DOCUMENT_POSITION_PRECEDING = 2,
     DOCUMENT_POSITION_FOLLOWING = 4,
     DOCUMENT_POSITION_CONTAINS = 8,
     DOCUMENT_POSITION_CONTAINED_BY = 16,
     DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32,
 }
 #[test]
@@ -5027,16 +4997,30 @@ impl nsPresContext {
         }
     }
     #[inline]
     pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) {
         self._bitfield_1 &= !(35184372088832usize as u64);
         self._bitfield_1 |=
             ((val as u32 as u64) << 45u32) & (35184372088832usize as u64);
     }
+    #[inline]
+    pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(((self._bitfield_1 &
+                                        (70368744177664usize as u64)) >>
+                                       46u32) as u32)
+        }
+    }
+    #[inline]
+    pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) {
+        self._bitfield_1 &= !(70368744177664usize as u64);
+        self._bitfield_1 |=
+            ((val as u32 as u64) << 46u32) & (70368744177664usize as u64);
+    }
 }
 /**
  * Smart pointer class that can hold a pointer to either a RestyleManager
  * or a ServoRestyleManager.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct RestyleManagerHandle {
@@ -5243,40 +5227,25 @@ fn bindgen_test_layout_PLDHashTable_Iter
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum PLDHashTable_SearchReason { ForSearchOrRemove = 0, ForAdd = 1, }
 extern "C" {
     #[link_name = "_ZN12PLDHashTable12kMaxCapacityE"]
     pub static PLDHashTable_kMaxCapacity: u32;
 }
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable12kMinCapacityE"]
-    pub static PLDHashTable_kMinCapacity: u32;
-}
+pub const PLDHashTable_kMinCapacity: u32 = 8;
 extern "C" {
     #[link_name = "_ZN12PLDHashTable17kMaxInitialLengthE"]
     pub static PLDHashTable_kMaxInitialLength: u32;
 }
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable21kDefaultInitialLengthE"]
-    pub static PLDHashTable_kDefaultInitialLength: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable9kHashBitsE"]
-    pub static PLDHashTable_kHashBits: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable12kGoldenRatioE"]
-    pub static PLDHashTable_kGoldenRatio: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable14kCollisionFlagE"]
-    pub static PLDHashTable_kCollisionFlag: PLDHashNumber;
-}
+pub const PLDHashTable_kDefaultInitialLength: u32 = 4;
+pub const PLDHashTable_kHashBits: u32 = 32;
+pub const PLDHashTable_kGoldenRatio: u32 = 2654435769;
+pub const PLDHashTable_kCollisionFlag: PLDHashNumber = 1;
 #[test]
 fn bindgen_test_layout_PLDHashTable() {
     assert_eq!(::std::mem::size_of::<PLDHashTable>() , 48usize);
     assert_eq!(::std::mem::align_of::<PLDHashTable>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct PLDHashTableOps {
@@ -5308,32 +5277,20 @@ impl Clone for PLDHashEntryHdr {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct Checker {
     pub mState: u32,
     pub mIsWritable: u32,
 }
-extern "C" {
-    #[link_name = "_ZN7Checker5kIdleE"]
-    pub static Checker_kIdle: u32;
-}
-extern "C" {
-    #[link_name = "_ZN7Checker6kRead1E"]
-    pub static Checker_kRead1: u32;
-}
-extern "C" {
-    #[link_name = "_ZN7Checker8kReadMaxE"]
-    pub static Checker_kReadMax: u32;
-}
-extern "C" {
-    #[link_name = "_ZN7Checker6kWriteE"]
-    pub static Checker_kWrite: u32;
-}
+pub const Checker_kIdle: u32 = 0;
+pub const Checker_kRead1: u32 = 1;
+pub const Checker_kReadMax: u32 = 9999;
+pub const Checker_kWrite: u32 = 10000;
 #[test]
 fn bindgen_test_layout_Checker() {
     assert_eq!(::std::mem::size_of::<Checker>() , 8usize);
     assert_eq!(::std::mem::align_of::<Checker>() , 4usize);
 }
 impl Clone for Checker {
     fn clone(&self) -> Self { *self }
 }
@@ -5365,22 +5322,21 @@ pub type PLDHashInitEntry =
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsPtrHashKey<T> {
     pub _base: PLDHashEntryHdr,
     pub mKey: *mut T,
 }
 pub type nsPtrHashKey_KeyType<T> = *mut T;
 pub type nsPtrHashKey_KeyTypePointer<T> = *mut T;
-pub const nsPtrHashKey_ALLOW_MEMMOVE:
-          nsPtrHashKey__bindgen_ty_bindgen_id_156719 =
-    nsPtrHashKey__bindgen_ty_bindgen_id_156719::ALLOW_MEMMOVE;
+pub const nsPtrHashKey_ALLOW_MEMMOVE: nsPtrHashKey__bindgen_ty_1 =
+    nsPtrHashKey__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPtrHashKey__bindgen_ty_bindgen_id_156719 { ALLOW_MEMMOVE = 0, }
+pub enum nsPtrHashKey__bindgen_ty_1 { ALLOW_MEMMOVE = 0, }
 /**
  * A node of content in a document's content model. This interface
  * is supported by all content objects.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIContent {
     pub _base: nsINode,
@@ -5388,38 +5344,36 @@ pub struct nsIContent {
 pub type nsIContent_IMEState = IMEState;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIContent_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIContent_eAllChildren: nsIContent__bindgen_ty_bindgen_id_158065 =
-    nsIContent__bindgen_ty_bindgen_id_158065::eAllChildren;
-pub const nsIContent_eAllButXBL: nsIContent__bindgen_ty_bindgen_id_158065 =
-    nsIContent__bindgen_ty_bindgen_id_158065::eAllButXBL;
-pub const nsIContent_eSkipPlaceholderContent:
-          nsIContent__bindgen_ty_bindgen_id_158065 =
-    nsIContent__bindgen_ty_bindgen_id_158065::eSkipPlaceholderContent;
+pub const nsIContent_eAllChildren: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eAllChildren;
+pub const nsIContent_eAllButXBL: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eAllButXBL;
+pub const nsIContent_eSkipPlaceholderContent: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eSkipPlaceholderContent;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_158065 {
+pub enum nsIContent__bindgen_ty_1 {
     eAllChildren = 0,
     eAllButXBL = 1,
     eSkipPlaceholderContent = 2,
 }
-pub const nsIContent_ATTR_MISSING: nsIContent__bindgen_ty_bindgen_id_158301 =
-    nsIContent__bindgen_ty_bindgen_id_158301::ATTR_MISSING;
-pub const nsIContent_ATTR_VALUE_NO_MATCH:
-          nsIContent__bindgen_ty_bindgen_id_158301 =
-    nsIContent__bindgen_ty_bindgen_id_158301::ATTR_VALUE_NO_MATCH;
+pub const nsIContent_ATTR_MISSING: nsIContent__bindgen_ty_2 =
+    nsIContent__bindgen_ty_2::ATTR_MISSING;
+pub const nsIContent_ATTR_VALUE_NO_MATCH: nsIContent__bindgen_ty_2 =
+    nsIContent__bindgen_ty_2::ATTR_VALUE_NO_MATCH;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_158301 {
+pub enum nsIContent__bindgen_ty_2 {
     ATTR_MISSING = -1,
     ATTR_VALUE_NO_MATCH = -2,
 }
 /**
    * Check whether this content node's given attribute has one of a given
    * list of values. If there is a match, we return the index in the list
    * of the first matching value. If there was no attribute at all, then
    * we return ATTR_MISSING. If there was an attribute but it didn't
@@ -5430,17 +5384,17 @@ pub enum nsIContent__bindgen_ty_bindgen_
    *                     be kNameSpaceID_Unknown.
    * @param aName The name atom of the attribute.  Must not be null.
    * @param aValues a nullptr-terminated array of pointers to atom values to test
    *                against.
    * @param aCaseSensitive Whether to do a case-sensitive compare on the values.
    * @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index
    * indicating the first value of aValues that matched
    */
-pub type nsIContent_AttrValuesArray = *const *mut nsIAtom;
+pub type nsIContent_AttrValuesArray = *const *const nsIAtom;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIContent_ETabFocusType {
     eTabFocus_textControlsMask = 1,
     eTabFocus_formElementsMask = 2,
     eTabFocus_linksMask = 4,
     eTabFocus_any = 7,
 }
@@ -5619,17 +5573,17 @@ pub struct FragmentOrElement_nsDOMSlots 
      * Holds any SMIL override style declaration for this element.
      */
     pub mSMILOverrideStyleDeclaration: RefPtr<DeclarationBlock>,
     /**
      * An object implementing nsIDOMMozNamedAttrMap for this content (attributes)
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
-    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436,
+    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_1,
     /**
      * An object implementing the .children property for this element.
      */
     pub mChildrenList: RefPtr<nsContentList>,
     /**
      * An object implementing the .classList property for this element.
      */
     pub mClassList: RefPtr<nsDOMTokenList>,
@@ -5657,36 +5611,36 @@ pub struct FragmentOrElement_nsDOMSlots 
     /**
      * Web components custom element data.
      */
     pub mCustomElementData: RefPtr<CustomElementData>,
     pub mRegisteredIntersectionObservers: nsTArray<FragmentOrElement_nsDOMSlots_IntersectionObserverRegistration>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436 {
+pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_1 {
     /**
       * The nearest enclosing content node with a binding that created us.
       * @see FragmentOrElement::GetBindingParent
       */
     pub mBindingParent: __BindgenUnionField<*mut nsIContent>,
     /**
       * The controllers of the XUL Element.
       */
     pub mControllers: __BindgenUnionField<*mut nsIControllers>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436() {
-    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436>()
+fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_1>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436>()
+    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_1>()
                , 8usize);
 }
-impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_159436 {
+impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 /**
      * Registered Intersection Observers on the element.
      */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct FragmentOrElement_nsDOMSlots_IntersectionObserverRegistration {
@@ -5764,67 +5718,58 @@ pub struct nsIChannel {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIChannel_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIChannel_LOAD_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_DOCUMENT_URI;
-pub const nsIChannel_LOAD_RETARGETED_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_RETARGETED_DOCUMENT_URI;
-pub const nsIChannel_LOAD_REPLACE: nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_REPLACE;
-pub const nsIChannel_LOAD_INITIAL_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_INITIAL_DOCUMENT_URI;
-pub const nsIChannel_LOAD_TARGETED: nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_TARGETED;
-pub const nsIChannel_LOAD_CALL_CONTENT_SNIFFERS:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_CALL_CONTENT_SNIFFERS;
-pub const nsIChannel_LOAD_CLASSIFY_URI:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_CLASSIFY_URI;
+pub const nsIChannel_LOAD_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_DOCUMENT_URI;
+pub const nsIChannel_LOAD_RETARGETED_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_RETARGETED_DOCUMENT_URI;
+pub const nsIChannel_LOAD_REPLACE: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_REPLACE;
+pub const nsIChannel_LOAD_INITIAL_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_INITIAL_DOCUMENT_URI;
+pub const nsIChannel_LOAD_TARGETED: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_TARGETED;
+pub const nsIChannel_LOAD_CALL_CONTENT_SNIFFERS: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_CALL_CONTENT_SNIFFERS;
+pub const nsIChannel_LOAD_CLASSIFY_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_CLASSIFY_URI;
 pub const nsIChannel_LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE;
-pub const nsIChannel_LOAD_EXPLICIT_CREDENTIALS:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_EXPLICIT_CREDENTIALS;
-pub const nsIChannel_LOAD_BYPASS_SERVICE_WORKER:
-          nsIChannel__bindgen_ty_bindgen_id_172960 =
-    nsIChannel__bindgen_ty_bindgen_id_172960::LOAD_BYPASS_SERVICE_WORKER;
+          nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE;
+pub const nsIChannel_LOAD_EXPLICIT_CREDENTIALS: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_EXPLICIT_CREDENTIALS;
+pub const nsIChannel_LOAD_BYPASS_SERVICE_WORKER: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_BYPASS_SERVICE_WORKER;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_172960 {
+pub enum nsIChannel__bindgen_ty_1 {
     LOAD_DOCUMENT_URI = 65536,
     LOAD_RETARGETED_DOCUMENT_URI = 131072,
     LOAD_REPLACE = 262144,
     LOAD_INITIAL_DOCUMENT_URI = 524288,
     LOAD_TARGETED = 1048576,
     LOAD_CALL_CONTENT_SNIFFERS = 2097152,
     LOAD_CLASSIFY_URI = 4194304,
     LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE = 8388608,
     LOAD_EXPLICIT_CREDENTIALS = 16777216,
     LOAD_BYPASS_SERVICE_WORKER = 33554432,
 }
-pub const nsIChannel_DISPOSITION_INLINE:
-          nsIChannel__bindgen_ty_bindgen_id_172980 =
-    nsIChannel__bindgen_ty_bindgen_id_172980::DISPOSITION_INLINE;
-pub const nsIChannel_DISPOSITION_ATTACHMENT:
-          nsIChannel__bindgen_ty_bindgen_id_172980 =
-    nsIChannel__bindgen_ty_bindgen_id_172980::DISPOSITION_ATTACHMENT;
+pub const nsIChannel_DISPOSITION_INLINE: nsIChannel__bindgen_ty_2 =
+    nsIChannel__bindgen_ty_2::DISPOSITION_INLINE;
+pub const nsIChannel_DISPOSITION_ATTACHMENT: nsIChannel__bindgen_ty_2 =
+    nsIChannel__bindgen_ty_2::DISPOSITION_ATTACHMENT;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_172980 {
+pub enum nsIChannel__bindgen_ty_2 {
     DISPOSITION_INLINE = 0,
     DISPOSITION_ATTACHMENT = 1,
 }
 #[test]
 fn bindgen_test_layout_nsIChannel() {
     assert_eq!(::std::mem::size_of::<nsIChannel>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsIChannel>() , 8usize);
 }
@@ -5838,57 +5783,45 @@ pub struct nsIRequest {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIRequest_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIRequest_LOAD_REQUESTMASK:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_REQUESTMASK;
-pub const nsIRequest_LOAD_NORMAL: nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_NORMAL;
-pub const nsIRequest_LOAD_BACKGROUND: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_BACKGROUND;
-pub const nsIRequest_INHIBIT_PIPELINE:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::INHIBIT_PIPELINE;
-pub const nsIRequest_INHIBIT_CACHING: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::INHIBIT_CACHING;
-pub const nsIRequest_INHIBIT_PERSISTENT_CACHING:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::INHIBIT_PERSISTENT_CACHING;
-pub const nsIRequest_LOAD_BYPASS_CACHE:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_BYPASS_CACHE;
-pub const nsIRequest_LOAD_FROM_CACHE: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_FROM_CACHE;
-pub const nsIRequest_VALIDATE_ALWAYS: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::VALIDATE_ALWAYS;
-pub const nsIRequest_VALIDATE_NEVER: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::VALIDATE_NEVER;
-pub const nsIRequest_VALIDATE_ONCE_PER_SESSION:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::VALIDATE_ONCE_PER_SESSION;
-pub const nsIRequest_LOAD_ANONYMOUS: nsIRequest__bindgen_ty_bindgen_id_172798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_ANONYMOUS;
-pub const nsIRequest_LOAD_FRESH_CONNECTION:
-          nsIRequest__bindgen_ty_bindgen_id_172798 =
-    nsIRequest__bindgen_ty_bindgen_id_172798::LOAD_FRESH_CONNECTION;
+pub const nsIRequest_LOAD_REQUESTMASK: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_REQUESTMASK;
+pub const nsIRequest_LOAD_NORMAL: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_NORMAL;
+pub const nsIRequest_LOAD_BACKGROUND: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_BACKGROUND;
+pub const nsIRequest_INHIBIT_PIPELINE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_PIPELINE;
+pub const nsIRequest_INHIBIT_CACHING: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_CACHING;
+pub const nsIRequest_INHIBIT_PERSISTENT_CACHING: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_PERSISTENT_CACHING;
+pub const nsIRequest_LOAD_BYPASS_CACHE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_BYPASS_CACHE;
+pub const nsIRequest_LOAD_FROM_CACHE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_FROM_CACHE;
+pub const nsIRequest_VALIDATE_ALWAYS: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_ALWAYS;
+pub const nsIRequest_VALIDATE_NEVER: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_NEVER;
+pub const nsIRequest_VALIDATE_ONCE_PER_SESSION: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_ONCE_PER_SESSION;
+pub const nsIRequest_LOAD_ANONYMOUS: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_ANONYMOUS;
+pub const nsIRequest_LOAD_FRESH_CONNECTION: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_FRESH_CONNECTION;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIRequest__bindgen_ty_bindgen_id_172798 {
+pub enum nsIRequest__bindgen_ty_1 {
     LOAD_REQUESTMASK = 65535,
     LOAD_NORMAL = 0,
     LOAD_BACKGROUND = 1,
     INHIBIT_PIPELINE = 64,
     INHIBIT_CACHING = 128,
     INHIBIT_PERSISTENT_CACHING = 256,
     LOAD_BYPASS_CACHE = 512,
     LOAD_FROM_CACHE = 1024,
@@ -6420,35 +6353,31 @@ pub enum nsIPresShell_IntrinsicDirty {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIPresShell_ReflowRootHandling {
     ePositionOrSizeChange = 0,
     eNoPositionOrSizeChange = 1,
     eInferFromBitToAdd = 2,
 }
-pub const nsIPresShell_SCROLL_TOP: nsIPresShell__bindgen_ty_bindgen_id_191568
-          =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_TOP;
-pub const nsIPresShell_SCROLL_BOTTOM:
-          nsIPresShell__bindgen_ty_bindgen_id_191568 =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_BOTTOM;
-pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_191568 =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_TOP;
-pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_191568 =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_BOTTOM;
-pub const nsIPresShell_SCROLL_CENTER:
-          nsIPresShell__bindgen_ty_bindgen_id_191568 =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_CENTER;
-pub const nsIPresShell_SCROLL_MINIMUM:
-          nsIPresShell__bindgen_ty_bindgen_id_191568 =
-    nsIPresShell__bindgen_ty_bindgen_id_191568::SCROLL_MINIMUM;
+pub const nsIPresShell_SCROLL_TOP: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_TOP;
+pub const nsIPresShell_SCROLL_BOTTOM: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_BOTTOM;
+pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_TOP;
+pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_BOTTOM;
+pub const nsIPresShell_SCROLL_CENTER: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_CENTER;
+pub const nsIPresShell_SCROLL_MINIMUM: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_MINIMUM;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_191568 {
+pub enum nsIPresShell__bindgen_ty_1 {
     SCROLL_TOP = 0,
     SCROLL_BOTTOM = 100,
     SCROLL_CENTER = 50,
     SCROLL_MINIMUM = -1,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIPresShell_WhenToScroll {
@@ -6464,61 +6393,53 @@ pub struct nsIPresShell_ScrollAxis {
 #[test]
 fn bindgen_test_layout_nsIPresShell_ScrollAxis() {
     assert_eq!(::std::mem::size_of::<nsIPresShell_ScrollAxis>() , 4usize);
     assert_eq!(::std::mem::align_of::<nsIPresShell_ScrollAxis>() , 4usize);
 }
 impl Clone for nsIPresShell_ScrollAxis {
     fn clone(&self) -> Self { *self }
 }
-pub const nsIPresShell_SCROLL_FIRST_ANCESTOR_ONLY:
-          nsIPresShell__bindgen_ty_bindgen_id_191599 =
-    nsIPresShell__bindgen_ty_bindgen_id_191599::SCROLL_FIRST_ANCESTOR_ONLY;
-pub const nsIPresShell_SCROLL_OVERFLOW_HIDDEN:
-          nsIPresShell__bindgen_ty_bindgen_id_191599 =
-    nsIPresShell__bindgen_ty_bindgen_id_191599::SCROLL_OVERFLOW_HIDDEN;
-pub const nsIPresShell_SCROLL_NO_PARENT_FRAMES:
-          nsIPresShell__bindgen_ty_bindgen_id_191599 =
-    nsIPresShell__bindgen_ty_bindgen_id_191599::SCROLL_NO_PARENT_FRAMES;
-pub const nsIPresShell_SCROLL_SMOOTH:
-          nsIPresShell__bindgen_ty_bindgen_id_191599 =
-    nsIPresShell__bindgen_ty_bindgen_id_191599::SCROLL_SMOOTH;
-pub const nsIPresShell_SCROLL_SMOOTH_AUTO:
-          nsIPresShell__bindgen_ty_bindgen_id_191599 =
-    nsIPresShell__bindgen_ty_bindgen_id_191599::SCROLL_SMOOTH_AUTO;
+pub const nsIPresShell_SCROLL_FIRST_ANCESTOR_ONLY: nsIPresShell__bindgen_ty_2
+          =
+    nsIPresShell__bindgen_ty_2::SCROLL_FIRST_ANCESTOR_ONLY;
+pub const nsIPresShell_SCROLL_OVERFLOW_HIDDEN: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_OVERFLOW_HIDDEN;
+pub const nsIPresShell_SCROLL_NO_PARENT_FRAMES: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_NO_PARENT_FRAMES;
+pub const nsIPresShell_SCROLL_SMOOTH: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_SMOOTH;
+pub const nsIPresShell_SCROLL_SMOOTH_AUTO: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_SMOOTH_AUTO;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_191599 {
+pub enum nsIPresShell__bindgen_ty_2 {
     SCROLL_FIRST_ANCESTOR_ONLY = 1,
     SCROLL_OVERFLOW_HIDDEN = 2,
     SCROLL_NO_PARENT_FRAMES = 4,
     SCROLL_SMOOTH = 8,
     SCROLL_SMOOTH_AUTO = 16,
 }
-pub const nsIPresShell_RENDER_IS_UNTRUSTED:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_IS_UNTRUSTED;
+pub const nsIPresShell_RENDER_IS_UNTRUSTED: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_IS_UNTRUSTED;
 pub const nsIPresShell_RENDER_IGNORE_VIEWPORT_SCROLLING:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_IGNORE_VIEWPORT_SCROLLING;
-pub const nsIPresShell_RENDER_CARET:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_CARET;
-pub const nsIPresShell_RENDER_USE_WIDGET_LAYERS:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_USE_WIDGET_LAYERS;
-pub const nsIPresShell_RENDER_ASYNC_DECODE_IMAGES:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_ASYNC_DECODE_IMAGES;
-pub const nsIPresShell_RENDER_DOCUMENT_RELATIVE:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_DOCUMENT_RELATIVE;
+          nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_IGNORE_VIEWPORT_SCROLLING;
+pub const nsIPresShell_RENDER_CARET: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_CARET;
+pub const nsIPresShell_RENDER_USE_WIDGET_LAYERS: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_USE_WIDGET_LAYERS;
+pub const nsIPresShell_RENDER_ASYNC_DECODE_IMAGES: nsIPresShell__bindgen_ty_3
+          =
+    nsIPresShell__bindgen_ty_3::RENDER_ASYNC_DECODE_IMAGES;
+pub const nsIPresShell_RENDER_DOCUMENT_RELATIVE: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_DOCUMENT_RELATIVE;
 pub const nsIPresShell_RENDER_DRAWWINDOW_NOT_FLUSHING:
-          nsIPresShell__bindgen_ty_bindgen_id_192054 =
-    nsIPresShell__bindgen_ty_bindgen_id_192054::RENDER_DRAWWINDOW_NOT_FLUSHING;
+          nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_DRAWWINDOW_NOT_FLUSHING;
 #[repr(u32)]
 /**
    * Render the document into an arbitrary gfxContext
    * Designed for getting a picture of a document or a piece of a document
    * Note that callers will generally want to call FlushPendingNotifications
    * to get an up-to-date view of the document
    * @param aRect is the region to capture into the offscreen buffer, in the
    * root frame's coordinate system (if aIgnoreViewportScrolling is false)
@@ -6549,50 +6470,47 @@ pub const nsIPresShell_RENDER_DRAWWINDOW
    * or the document is in ignore viewport scrolling mode
    * (nsIPresShell::SetIgnoreViewportScrolling/IgnoringViewportScrolling).
    * @param aBackgroundColor a background color to render onto
    * @param aRenderedContext the gfxContext to render to. We render so that
    * one CSS pixel in the source document is rendered to one unit in the current
    * transform.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_192054 {
+pub enum nsIPresShell__bindgen_ty_3 {
     RENDER_IS_UNTRUSTED = 1,
     RENDER_IGNORE_VIEWPORT_SCROLLING = 2,
     RENDER_CARET = 4,
     RENDER_USE_WIDGET_LAYERS = 8,
     RENDER_ASYNC_DECODE_IMAGES = 16,
     RENDER_DOCUMENT_RELATIVE = 32,
     RENDER_DRAWWINDOW_NOT_FLUSHING = 64,
 }
-pub const nsIPresShell_RENDER_IS_IMAGE:
-          nsIPresShell__bindgen_ty_bindgen_id_192072 =
-    nsIPresShell__bindgen_ty_bindgen_id_192072::RENDER_IS_IMAGE;
-pub const nsIPresShell_RENDER_AUTO_SCALE:
-          nsIPresShell__bindgen_ty_bindgen_id_192072 =
-    nsIPresShell__bindgen_ty_bindgen_id_192072::RENDER_AUTO_SCALE;
+pub const nsIPresShell_RENDER_IS_IMAGE: nsIPresShell__bindgen_ty_4 =
+    nsIPresShell__bindgen_ty_4::RENDER_IS_IMAGE;
+pub const nsIPresShell_RENDER_AUTO_SCALE: nsIPresShell__bindgen_ty_4 =
+    nsIPresShell__bindgen_ty_4::RENDER_AUTO_SCALE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_192072 {
+pub enum nsIPresShell__bindgen_ty_4 {
     RENDER_IS_IMAGE = 256,
     RENDER_AUTO_SCALE = 128,
 }
-pub const nsIPresShell_FORCE_DRAW: nsIPresShell__bindgen_ty_bindgen_id_192210
-          =
-    nsIPresShell__bindgen_ty_bindgen_id_192210::FORCE_DRAW;
+pub const nsIPresShell_FORCE_DRAW: nsIPresShell__bindgen_ty_5 =
+    nsIPresShell__bindgen_ty_5::FORCE_DRAW;
 #[repr(u32)]
 /**
    * Add a solid color item to the bottom of aList with frame aFrame and bounds
    * aBounds. Checks first if this needs to be done by checking if aFrame is a
    * canvas frame (if the FORCE_DRAW flag is passed then this check is skipped).
    * aBackstopColor is composed behind the background color of the canvas, it is
    * transparent by default.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_192210 { FORCE_DRAW = 1, }
+pub enum nsIPresShell__bindgen_ty_5 { FORCE_DRAW = 1, }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIPresShell_PointerCaptureInfo {
     pub mPendingContent: nsCOMPtr<nsIContent>,
     pub mOverrideContent: nsCOMPtr<nsIContent>,
 }
 #[test]
 fn bindgen_test_layout_nsIPresShell_PointerCaptureInfo() {
@@ -6952,77 +6870,73 @@ impl Clone for TextOrElementOrDocument {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct DOMPointInit {
     pub _address: u8,
 }
 impl Clone for DOMPointInit {
     fn clone(&self) -> Self { *self }
 }
-pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_LISTENERMANAGER;
-pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_PROPERTIES;
-pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_ANONYMOUS_ROOT;
-pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
-pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_NATIVE_ANONYMOUS_ROOT;
-pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_FORCE_XBL_BINDINGS;
-pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_MAY_BE_IN_BINDING_MNGR;
-pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_EDITABLE;
-pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_MAY_HAVE_CLASS;
-pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_IN_SHADOW_TREE;
-pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_EMPTY_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_SLOW_SELECTOR;
-pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_EDGE_CHILD_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_193622
-          =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
-pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_ALL_SELECTOR_FLAGS;
-pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_NEEDS_FRAME;
-pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_DESCENDANTS_NEED_FRAMES;
-pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_ACCESSKEY;
-pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_DIRECTION_RTL;
-pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_HAS_DIRECTION_LTR;
-pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_ALL_DIRECTION_FLAGS;
-pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_CHROME_ONLY_ACCESS;
-pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
-pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_193622
-          =
-    _bindgen_ty_bindgen_id_193622::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_193622 =
-    _bindgen_ty_bindgen_id_193622::NODE_TYPE_SPECIFIC_BITS_OFFSET;
+pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_LISTENERMANAGER;
+pub const NODE_HAS_PROPERTIES: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_PROPERTIES;
+pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_IS_ANONYMOUS_ROOT;
+pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
+pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_IS_NATIVE_ANONYMOUS_ROOT;
+pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_FORCE_XBL_BINDINGS;
+pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_MAY_BE_IN_BINDING_MNGR;
+pub const NODE_IS_EDITABLE: _bindgen_ty_68 = _bindgen_ty_68::NODE_IS_EDITABLE;
+pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_MAY_HAVE_CLASS;
+pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_IS_IN_SHADOW_TREE;
+pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_EMPTY_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_SLOW_SELECTOR;
+pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_EDGE_CHILD_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
+pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_ALL_SELECTOR_FLAGS;
+pub const NODE_NEEDS_FRAME: _bindgen_ty_68 = _bindgen_ty_68::NODE_NEEDS_FRAME;
+pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_DESCENDANTS_NEED_FRAMES;
+pub const NODE_HAS_ACCESSKEY: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_ACCESSKEY;
+pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_DIRECTION_RTL;
+pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_HAS_DIRECTION_LTR;
+pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_ALL_DIRECTION_FLAGS;
+pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_CHROME_ONLY_ACCESS;
+pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
+pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_68 =
+    _bindgen_ty_68::NODE_TYPE_SPECIFIC_BITS_OFFSET;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum _bindgen_ty_bindgen_id_193622 {
+pub enum _bindgen_ty_68 {
     NODE_HAS_LISTENERMANAGER = 4,
     NODE_HAS_PROPERTIES = 8,
     NODE_IS_ANONYMOUS_ROOT = 16,
     NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE = 32,
     NODE_IS_NATIVE_ANONYMOUS_ROOT = 64,
     NODE_FORCE_XBL_BINDINGS = 128,
     NODE_MAY_BE_IN_BINDING_MNGR = 256,
     NODE_IS_EDITABLE = 512,
@@ -7068,30 +6982,27 @@ pub struct nsITimer {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsITimer_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsITimer_TYPE_ONE_SHOT: nsITimer__bindgen_ty_bindgen_id_206140 =
-    nsITimer__bindgen_ty_bindgen_id_206140::TYPE_ONE_SHOT;
-pub const nsITimer_TYPE_REPEATING_SLACK:
-          nsITimer__bindgen_ty_bindgen_id_206140 =
-    nsITimer__bindgen_ty_bindgen_id_206140::TYPE_REPEATING_SLACK;
-pub const nsITimer_TYPE_REPEATING_PRECISE:
-          nsITimer__bindgen_ty_bindgen_id_206140 =
-    nsITimer__bindgen_ty_bindgen_id_206140::TYPE_REPEATING_PRECISE;
-pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP:
-          nsITimer__bindgen_ty_bindgen_id_206140 =
-    nsITimer__bindgen_ty_bindgen_id_206140::TYPE_REPEATING_PRECISE_CAN_SKIP;
+pub const nsITimer_TYPE_ONE_SHOT: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_ONE_SHOT;
+pub const nsITimer_TYPE_REPEATING_SLACK: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_SLACK;
+pub const nsITimer_TYPE_REPEATING_PRECISE: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_PRECISE;
+pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_PRECISE_CAN_SKIP;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsITimer__bindgen_ty_bindgen_id_206140 {
+pub enum nsITimer__bindgen_ty_1 {
     TYPE_ONE_SHOT = 0,
     TYPE_REPEATING_SLACK = 1,
     TYPE_REPEATING_PRECISE = 2,
     TYPE_REPEATING_PRECISE_CAN_SKIP = 3,
 }
 #[test]
 fn bindgen_test_layout_nsITimer() {
     assert_eq!(::std::mem::size_of::<nsITimer>() , 8usize);
@@ -7105,25 +7016,24 @@ impl Clone for nsITimer {
  * is 32 bits so that objects that includes this as a field can pad and align
  * efficiently.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsExpirationState {
     pub _bitfield_1: u32,
 }
-pub const nsExpirationState_NOT_TRACKED:
-          nsExpirationState__bindgen_ty_bindgen_id_206616 =
-    nsExpirationState__bindgen_ty_bindgen_id_206616::NOT_TRACKED;
+pub const nsExpirationState_NOT_TRACKED: nsExpirationState__bindgen_ty_1 =
+    nsExpirationState__bindgen_ty_1::NOT_TRACKED;
 pub const nsExpirationState_MAX_INDEX_IN_GENERATION:
-          nsExpirationState__bindgen_ty_bindgen_id_206616 =
-    nsExpirationState__bindgen_ty_bindgen_id_206616::MAX_INDEX_IN_GENERATION;
+          nsExpirationState__bindgen_ty_1 =
+    nsExpirationState__bindgen_ty_1::MAX_INDEX_IN_GENERATION;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsExpirationState__bindgen_ty_bindgen_id_206616 {
+pub enum nsExpirationState__bindgen_ty_1 {
     NOT_TRACKED = 15,
     MAX_INDEX_IN_GENERATION = 268435455,
 }
 #[test]
 fn bindgen_test_layout_nsExpirationState() {
     assert_eq!(::std::mem::size_of::<nsExpirationState>() , 4usize);
     assert_eq!(::std::mem::align_of::<nsExpirationState>() , 4usize);
 }
@@ -7185,62 +7095,53 @@ pub struct imgIRequest {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imgIRequest_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const imgIRequest_STATUS_NONE: imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_NONE;
-pub const imgIRequest_STATUS_SIZE_AVAILABLE:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_SIZE_AVAILABLE;
-pub const imgIRequest_STATUS_LOAD_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_LOAD_COMPLETE;
-pub const imgIRequest_STATUS_ERROR: imgIRequest__bindgen_ty_bindgen_id_208035
-          =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_ERROR;
-pub const imgIRequest_STATUS_FRAME_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_FRAME_COMPLETE;
-pub const imgIRequest_STATUS_DECODE_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_DECODE_COMPLETE;
-pub const imgIRequest_STATUS_IS_ANIMATED:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_IS_ANIMATED;
-pub const imgIRequest_STATUS_HAS_TRANSPARENCY:
-          imgIRequest__bindgen_ty_bindgen_id_208035 =
-    imgIRequest__bindgen_ty_bindgen_id_208035::STATUS_HAS_TRANSPARENCY;
+pub const imgIRequest_STATUS_NONE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_NONE;
+pub const imgIRequest_STATUS_SIZE_AVAILABLE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_SIZE_AVAILABLE;
+pub const imgIRequest_STATUS_LOAD_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_LOAD_COMPLETE;
+pub const imgIRequest_STATUS_ERROR: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_ERROR;
+pub const imgIRequest_STATUS_FRAME_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_FRAME_COMPLETE;
+pub const imgIRequest_STATUS_DECODE_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_DECODE_COMPLETE;
+pub const imgIRequest_STATUS_IS_ANIMATED: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_IS_ANIMATED;
+pub const imgIRequest_STATUS_HAS_TRANSPARENCY: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_HAS_TRANSPARENCY;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_208035 {
+pub enum imgIRequest__bindgen_ty_1 {
     STATUS_NONE = 0,
     STATUS_SIZE_AVAILABLE = 1,
     STATUS_LOAD_COMPLETE = 2,
     STATUS_ERROR = 4,
     STATUS_FRAME_COMPLETE = 8,
     STATUS_DECODE_COMPLETE = 16,
     STATUS_IS_ANIMATED = 32,
     STATUS_HAS_TRANSPARENCY = 64,
 }
-pub const imgIRequest_CORS_NONE: imgIRequest__bindgen_ty_bindgen_id_208115 =
-    imgIRequest__bindgen_ty_bindgen_id_208115::CORS_NONE;
-pub const imgIRequest_CORS_ANONYMOUS:
-          imgIRequest__bindgen_ty_bindgen_id_208115 =
-    imgIRequest__bindgen_ty_bindgen_id_208115::CORS_ANONYMOUS;
-pub const imgIRequest_CORS_USE_CREDENTIALS:
-          imgIRequest__bindgen_ty_bindgen_id_208115 =
-    imgIRequest__bindgen_ty_bindgen_id_208115::CORS_USE_CREDENTIALS;
+pub const imgIRequest_CORS_NONE: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_NONE;
+pub const imgIRequest_CORS_ANONYMOUS: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_ANONYMOUS;
+pub const imgIRequest_CORS_USE_CREDENTIALS: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_USE_CREDENTIALS;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_208115 {
+pub enum imgIRequest__bindgen_ty_2 {
     CORS_NONE = 1,
     CORS_ANONYMOUS = 2,
     CORS_USE_CREDENTIALS = 3,
 }
 #[test]
 fn bindgen_test_layout_imgIRequest() {
     assert_eq!(::std::mem::size_of::<imgIRequest>() , 8usize);
     assert_eq!(::std::mem::align_of::<imgIRequest>() , 8usize);
@@ -7548,22 +7449,22 @@ pub struct URLValue {
     pub _base: URLValueData,
 }
 #[test]
 fn bindgen_test_layout_URLValue() {
     assert_eq!(::std::mem::size_of::<URLValue>() , 64usize);
     assert_eq!(::std::mem::align_of::<URLValue>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_226828 {
+pub struct URLValueData__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct URLValueData {
-    pub vtable_: *const bindgen_vtable__bindgen_id_226828,
+    pub vtable_: *const URLValueData__bindgen_vtable,
     pub mRefCnt: ThreadSafeAutoRefCnt,
     pub mURI: nsMainThreadPtrHandle<nsIURI>,
     pub mBaseURI: nsMainThreadPtrHandle<nsIURI>,
     pub mString: RefPtr<nsStringBuffer>,
     pub mReferrer: nsMainThreadPtrHandle<nsIURI>,
     pub mOriginPrincipal: nsMainThreadPtrHandle<nsIPrincipal>,
     pub mURIResolved: bool,
     pub mIsLocalRef: bool,
@@ -7764,23 +7665,21 @@ pub struct nsPresArena_FreeList {
     pub mEntries: nsTArray<*mut ::std::os::raw::c_void>,
     pub mEntrySize: usize,
     pub mEntriesEverAllocated: usize,
     pub mKey: nsPresArena_FreeList_KeyTypePointer,
 }
 pub type nsPresArena_FreeList_KeyType = u32;
 pub type nsPresArena_FreeList_KeyTypePointer = *const ::std::os::raw::c_void;
 pub const nsPresArena_FreeList_ALLOW_MEMMOVE:
-          nsPresArena_FreeList__bindgen_ty_bindgen_id_228995 =
-    nsPresArena_FreeList__bindgen_ty_bindgen_id_228995::ALLOW_MEMMOVE;
+          nsPresArena_FreeList__bindgen_ty_1 =
+    nsPresArena_FreeList__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_228995 {
-    ALLOW_MEMMOVE = 0,
-}
+pub enum nsPresArena_FreeList__bindgen_ty_1 { ALLOW_MEMMOVE = 0, }
 #[test]
 fn bindgen_test_layout_nsPresArena_FreeList() {
     assert_eq!(::std::mem::size_of::<nsPresArena_FreeList>() , 40usize);
     assert_eq!(::std::mem::align_of::<nsPresArena_FreeList>() , 8usize);
 }
 #[test]
 fn bindgen_test_layout_nsPresArena() {
     assert_eq!(::std::mem::size_of::<nsPresArena>() , 152usize);
@@ -7794,45 +7693,45 @@ pub struct imgINotificationObserver {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imgINotificationObserver_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub const imgINotificationObserver_SIZE_AVAILABLE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::SIZE_AVAILABLE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::SIZE_AVAILABLE;
 pub const imgINotificationObserver_FRAME_UPDATE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::FRAME_UPDATE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::FRAME_UPDATE;
 pub const imgINotificationObserver_FRAME_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::FRAME_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::FRAME_COMPLETE;
 pub const imgINotificationObserver_LOAD_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::LOAD_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::LOAD_COMPLETE;
 pub const imgINotificationObserver_DECODE_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::DECODE_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::DECODE_COMPLETE;
 pub const imgINotificationObserver_DISCARD:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::DISCARD;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::DISCARD;
 pub const imgINotificationObserver_UNLOCKED_DRAW:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::UNLOCKED_DRAW;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::UNLOCKED_DRAW;
 pub const imgINotificationObserver_IS_ANIMATED:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::IS_ANIMATED;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::IS_ANIMATED;
 pub const imgINotificationObserver_HAS_TRANSPARENCY:
-          imgINotificationObserver__bindgen_ty_bindgen_id_229142 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_229142::HAS_TRANSPARENCY;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::HAS_TRANSPARENCY;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgINotificationObserver__bindgen_ty_bindgen_id_229142 {
+pub enum imgINotificationObserver__bindgen_ty_1 {
     SIZE_AVAILABLE = 1,
     FRAME_UPDATE = 2,
     FRAME_COMPLETE = 3,
     LOAD_COMPLETE = 4,
     DECODE_COMPLETE = 5,
     DISCARD = 6,
     UNLOCKED_DRAW = 7,
     IS_ANIMATED = 8,
@@ -8070,23 +7969,21 @@ pub struct gfxFontFeatureValueSet_Featur
     pub mKey: gfxFontFeatureValueSet_FeatureValueHashKey,
     pub mValues: nsTArray<::std::os::raw::c_uint>,
 }
 pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyType =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 pub const gfxFontFeatureValueSet_FeatureValueHashEntry_ALLOW_MEMMOVE:
-          gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_230402
-          =
-    gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_230402::ALLOW_MEMMOVE;
+          gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 =
+    gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_230402
-         {
+pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 {
     ALLOW_MEMMOVE = 1,
 }
 #[test]
 fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashEntry() {
     assert_eq!(::std::mem::size_of::<gfxFontFeatureValueSet_FeatureValueHashEntry>()
                , 56usize);
     assert_eq!(::std::mem::align_of::<gfxFontFeatureValueSet_FeatureValueHashEntry>()
                , 8usize);
@@ -8426,33 +8323,31 @@ pub enum nsStyleUnit {
     eStyleUnit_FlexFraction = 16,
     eStyleUnit_Coord = 20,
     eStyleUnit_Integer = 30,
     eStyleUnit_Enumerated = 32,
     eStyleUnit_Calc = 40,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_bindgen_id_231019 {
+pub struct _bindgen_ty_26 {
     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_231019() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_231019>() ,
-               8usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_231019>() ,
-               8usize);
-}
-impl Clone for _bindgen_ty_bindgen_id_231019 {
-    fn clone(&self) -> Self { *self }
-}
-pub type nsStyleUnion = _bindgen_ty_bindgen_id_231019;
+fn bindgen_test_layout__bindgen_ty_26() {
+    assert_eq!(::std::mem::size_of::<_bindgen_ty_26>() , 8usize);
+    assert_eq!(::std::mem::align_of::<_bindgen_ty_26>() , 8usize);
+}
+impl Clone for _bindgen_ty_26 {
+    fn clone(&self) -> Self { *self }
+}
+pub type nsStyleUnion = _bindgen_ty_26;
 /**
  * Class that hold a single size specification used by the style
  * system.  The size specification consists of two parts -- a number
  * and a unit.  The number is an integer, a floating point value, an
  * nscoord, or undefined, and the unit is an nsStyleUnit.  Checking
  * the unit is a must before asking for the value in any particular
  * form.
  */
@@ -10255,34 +10150,34 @@ fn bindgen_test_layout_imgRequestProxy_i
                8usize);
 }
 #[test]
 fn bindgen_test_layout_imgRequestProxy() {
     assert_eq!(::std::mem::size_of::<imgRequestProxy>() , 120usize);
     assert_eq!(::std::mem::align_of::<imgRequestProxy>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_241728 {
+pub struct IProgressObserver__bindgen_vtable {
 }
 /**
  * An interface for observing changes to image state, as reported by
  * ProgressTracker.
  *
  * This is the ImageLib-internal version of imgINotificationObserver,
  * essentially, with implementation details that code outside of ImageLib
  * shouldn't see.
  *
  * XXX(seth): It's preferable to avoid adding anything to this interface if
  * possible.  In the long term, it would be ideal to get to a place where we can
  * just use the imgINotificationObserver interface internally as well.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct IProgressObserver {
-    pub vtable_: *const bindgen_vtable__bindgen_id_241728,
+    pub vtable_: *const IProgressObserver__bindgen_vtable,
     pub _base: u64,
 }
 #[test]
 fn bindgen_test_layout_IProgressObserver() {
     assert_eq!(::std::mem::size_of::<IProgressObserver>() , 16usize);
     assert_eq!(::std::mem::align_of::<IProgressObserver>() , 8usize);
 }
 #[repr(C)]
@@ -10293,33 +10188,33 @@ pub struct nsISupportsPriority {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsISupportsPriority_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub const nsISupportsPriority_PRIORITY_HIGHEST:
-          nsISupportsPriority__bindgen_ty_bindgen_id_241809 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_241809::PRIORITY_HIGHEST;
-pub const nsISupportsPriority_PRIORITY_HIGH:
-          nsISupportsPriority__bindgen_ty_bindgen_id_241809 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_241809::PRIORITY_HIGH;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_HIGHEST;
+pub const nsISupportsPriority_PRIORITY_HIGH: nsISupportsPriority__bindgen_ty_1
+          =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_HIGH;
 pub const nsISupportsPriority_PRIORITY_NORMAL:
-          nsISupportsPriority__bindgen_ty_bindgen_id_241809 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_241809::PRIORITY_NORMAL;
-pub const nsISupportsPriority_PRIORITY_LOW:
-          nsISupportsPriority__bindgen_ty_bindgen_id_241809 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_241809::PRIORITY_LOW;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_NORMAL;
+pub const nsISupportsPriority_PRIORITY_LOW: nsISupportsPriority__bindgen_ty_1
+          =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_LOW;
 pub const nsISupportsPriority_PRIORITY_LOWEST:
-          nsISupportsPriority__bindgen_ty_bindgen_id_241809 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_241809::PRIORITY_LOWEST;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_LOWEST;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsISupportsPriority__bindgen_ty_bindgen_id_241809 {
+pub enum nsISupportsPriority__bindgen_ty_1 {
     PRIORITY_HIGHEST = -20,
     PRIORITY_HIGH = -10,
     PRIORITY_NORMAL = 0,
     PRIORITY_LOW = 10,
     PRIORITY_LOWEST = 20,
 }
 #[test]
 fn bindgen_test_layout_nsISupportsPriority() {
@@ -10743,33 +10638,33 @@ pub type nsCSSValueFloatColor_HasThreadS
 fn bindgen_test_layout_nsCSSValueFloatColor() {
     assert_eq!(::std::mem::size_of::<nsCSSValueFloatColor>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsCSSValueFloatColor>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsCSSValue {
     pub mUnit: nsCSSUnit,
-    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_244854,
+    pub mValue: nsCSSValue__bindgen_ty_1,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsCSSValue_Array {
     pub mRefCnt: usize,
     pub mCount: usize,
     pub mArray: [nsCSSValue; 1usize],
 }
 #[test]
 fn bindgen_test_layout_nsCSSValue_Array() {
     assert_eq!(::std::mem::size_of::<nsCSSValue_Array>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsCSSValue_Array>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsCSSValue__bindgen_ty_bindgen_id_244854 {
+pub struct nsCSSValue__bindgen_ty_1 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mString: __BindgenUnionField<*mut nsStringBuffer>,
     pub mColor: __BindgenUnionField<nscolor>,
     pub mArray: __BindgenUnionField<*mut nsCSSValue_Array>,
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub mImage: __BindgenUnionField<*mut ImageValue>,
     pub mGridTemplateAreas: __BindgenUnionField<*mut GridTemplateAreasValue>,
@@ -10784,23 +10679,21 @@ pub struct nsCSSValue__bindgen_ty_bindge
     pub mPairList: __BindgenUnionField<*mut nsCSSValuePairList_heap>,
     pub mPairListDependent: __BindgenUnionField<*mut nsCSSValuePairList>,
     pub mFloatColor: __BindgenUnionField<*mut nsCSSValueFloatColor>,
     pub mFontFamilyList: __BindgenUnionField<*mut FontFamilyListRefCnt>,
     pub mComplexColor: __BindgenUnionField<*mut ComplexColorValue>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_244854() {
-    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_244854>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_244854>()
-               , 8usize);
-}
-impl Clone for nsCSSValue__bindgen_ty_bindgen_id_244854 {
+fn bindgen_test_layout_nsCSSValue__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsCSSValue__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsCSSValue() {
     assert_eq!(::std::mem::size_of::<nsCSSValue>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsCSSValue>() , 8usize);
 }
 #[repr(C)]
@@ -10871,22 +10764,22 @@ fn bindgen_test_layout_CSSVariableValues
     assert_eq!(::std::mem::align_of::<CSSVariableValues_Variable>() , 8usize);
 }
 #[test]
 fn bindgen_test_layout_CSSVariableValues() {
     assert_eq!(::std::mem::size_of::<CSSVariableValues>() , 56usize);
     assert_eq!(::std::mem::align_of::<CSSVariableValues>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_245962 {
+pub struct CounterStyle__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct CounterStyle {
-    pub vtable_: *const bindgen_vtable__bindgen_id_245962,
+    pub vtable_: *const CounterStyle__bindgen_vtable,
     pub mStyle: i32,
 }
 #[test]
 fn bindgen_test_layout_CounterStyle() {
     assert_eq!(::std::mem::size_of::<CounterStyle>() , 16usize);
     assert_eq!(::std::mem::align_of::<CounterStyle>() , 8usize);
 }
 impl Clone for CounterStyle {
@@ -11096,35 +10989,33 @@ fn bindgen_test_layout_CachedBorderImage
  * image of type (1)).
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleImage {
     pub mCachedBIData: UniquePtr<CachedBorderImageData,
                                  DefaultDelete<CachedBorderImageData>>,
     pub mType: nsStyleImageType,
-    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_247952,
+    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_1,
     pub mCropRect: UniquePtr<nsStyleSides, DefaultDelete<nsStyleSides>>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleImage__bindgen_ty_bindgen_id_247952 {
+pub struct nsStyleImage__bindgen_ty_1 {
     pub mImage: __BindgenUnionField<*mut nsStyleImageRequest>,
     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_247952() {
-    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_247952>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_247952>()
-               , 8usize);
-}
-impl Clone for nsStyleImage__bindgen_ty_bindgen_id_247952 {
+fn bindgen_test_layout_nsStyleImage__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsStyleImage__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleImage() {
     assert_eq!(::std::mem::size_of::<nsStyleImage>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsStyleImage>() , 8usize);
 }
 #[repr(C)]
@@ -11163,55 +11054,43 @@ pub struct nsStyleImageLayers {
     pub mPositionYCount: u32,
     pub mImageCount: u32,
     pub mSizeCount: u32,
     pub mMaskModeCount: u32,
     pub mBlendModeCount: u32,
     pub mCompositeCount: u32,
     pub mLayers: nsStyleAutoArray<nsStyleImageLayers_Layer>,
 }
-pub const nsStyleImageLayers_shorthand:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::shorthand;
-pub const nsStyleImageLayers_color:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::color;
-pub const nsStyleImageLayers_image:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::image;
-pub const nsStyleImageLayers_repeat:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::repeat;
-pub const nsStyleImageLayers_positionX:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::positionX;
-pub const nsStyleImageLayers_positionY:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::positionY;
-pub const nsStyleImageLayers_clip:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::clip;
-pub const nsStyleImageLayers_origin:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::origin;
-pub const nsStyleImageLayers_size:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::size;
-pub const nsStyleImageLayers_attachment:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::attachment;
-pub const nsStyleImageLayers_maskMode:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::maskMode;
-pub const nsStyleImageLayers_composite:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_248014 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_248014::composite;
+pub const nsStyleImageLayers_shorthand: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::shorthand;
+pub const nsStyleImageLayers_color: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::color;
+pub const nsStyleImageLayers_image: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::image;
+pub const nsStyleImageLayers_repeat: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::repeat;
+pub const nsStyleImageLayers_positionX: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::positionX;
+pub const nsStyleImageLayers_positionY: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::positionY;
+pub const nsStyleImageLayers_clip: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::clip;
+pub const nsStyleImageLayers_origin: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::origin;
+pub const nsStyleImageLayers_size: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::size;
+pub const nsStyleImageLayers_attachment: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::attachment;
+pub const nsStyleImageLayers_maskMode: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::maskMode;
+pub const nsStyleImageLayers_composite: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::composite;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_248014 {
+pub enum nsStyleImageLayers__bindgen_ty_1 {
     shorthand = 0,
     color = 1,
     image = 2,
     repeat = 3,
     positionX = 4,
     positionY = 5,
     clip = 6,
     origin = 7,
@@ -11392,55 +11271,54 @@ pub struct nsStyleBorder {
     pub mBorderImageWidth: nsStyleSides,
     pub mBorderImageOutset: nsStyleSides,
     pub mBorderImageFill: u8,
     pub mBorderImageRepeatH: u8,
     pub mBorderImageRepeatV: u8,
     pub mFloatEdge: StyleFloatEdge,
     pub mBoxDecorationBreak: StyleBoxDecorationBreak,
     pub mBorderStyle: [u8; 4usize],
-    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_bindgen_id_248684,
+    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_1,
     pub mComputedBorder: nsMargin,
     pub mBorder: nsMargin,
     pub mTwipsPerPixel: nscoord,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleBorder__bindgen_ty_bindgen_id_248684 {
-    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685>,
+pub struct nsStyleBorder__bindgen_ty_1 {
+    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_1_1>,
     pub mBorderColor: __BindgenUnionField<[StyleComplexColor; 4usize]>,
     pub bindgen_union_field: [u32; 8usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685 {
+pub struct nsStyleBorder__bindgen_ty_1_1 {
     pub mBorderTopColor: StyleComplexColor,
     pub mBorderRightColor: StyleComplexColor,
     pub mBorderBottomColor: StyleComplexColor,
     pub mBorderLeftColor: StyleComplexColor,
 }
 #[test]
-fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685>()
-               , 32usize);
-    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685>()
-               , 4usize);
-}
-impl Clone for
- nsStyleBorder__bindgen_ty_bindgen_id_248684__bindgen_ty_bindgen_id_248685 {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_248684() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_248684>()
-               , 32usize);
-    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_248684>()
-               , 4usize);
-}
-impl Clone for nsStyleBorder__bindgen_ty_bindgen_id_248684 {
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_1_1>() ,
+               32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_1_1>() ,
+               4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_1_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_1>() ,
+               32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_1>() ,
+               4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleBorder() {
     assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 312usize);
     assert_eq!(::std::mem::align_of::<nsStyleBorder>() , 8usize);
 }
 #[repr(C)]
@@ -11503,24 +11381,18 @@ fn bindgen_test_layout_nsStyleList() {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleGridLine {
     pub mHasSpan: bool,
     pub mInteger: i32,
     pub mLineName: nsString,
 }
-extern "C" {
-    #[link_name = "_ZN15nsStyleGridLine8kMinLineE"]
-    pub static nsStyleGridLine_kMinLine: i32;
-}
-extern "C" {
-    #[link_name = "_ZN15nsStyleGridLine8kMaxLineE"]
-    pub static nsStyleGridLine_kMaxLine: i32;
-}
+pub const nsStyleGridLine_kMinLine: i32 = -10000;
+pub const nsStyleGridLine_kMaxLine: i32 = 10000;
 #[test]
 fn bindgen_test_layout_nsStyleGridLine() {
     assert_eq!(::std::mem::size_of::<nsStyleGridLine>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsStyleGridLine>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleGridTemplate {
@@ -11737,17 +11609,17 @@ fn bindgen_test_layout_nsStyleImageOrien
 }
 impl Clone for nsStyleImageOrientation {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsTimingFunction {
     pub mType: nsTimingFunction_Type,
-    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_249680,
+    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_1,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsTimingFunction_Type {
     Ease = 0,
     Linear = 1,
     EaseIn = 2,
     EaseOut = 3,
@@ -11756,66 +11628,62 @@ pub enum nsTimingFunction_Type {
     StepEnd = 6,
     CubicBezier = 7,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsTimingFunction_Keyword { Implicit = 0, Explicit = 1, }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_249680 {
-    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681>,
-    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692>,
+pub struct nsTimingFunction__bindgen_ty_1 {
+    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_1_1>,
+    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_1_2>,
     pub bindgen_union_field: [u32; 4usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681 {
+pub struct nsTimingFunction__bindgen_ty_1_1 {
     pub mX1: f32,
     pub mY1: f32,
     pub mX2: f32,
     pub mY2: f32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681>()
-               , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681>()
-               , 4usize);
-}
-impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249681
- {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692 {
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1_1() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1_1>() ,
+               16usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1_1>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsTimingFunction__bindgen_ty_1_2 {
     pub mSteps: u32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692>()
-               , 4usize);
-}
-impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_249680__bindgen_ty_bindgen_id_249692
- {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_249680() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680>()
-               , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_249680>()
-               , 4usize);
-}
-impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_249680 {
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1_2() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1_2>() ,
+               4usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1_2>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1_2 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1>() ,
+               16usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsTimingFunction() {
     assert_eq!(::std::mem::size_of::<nsTimingFunction>() , 20usize);
     assert_eq!(::std::mem::align_of::<nsTimingFunction>() , 4usize);
 }
 impl Clone for nsTimingFunction {
@@ -11866,23 +11734,23 @@ pub type StyleBasicShape_HasThreadSafeRe
 #[test]
 fn bindgen_test_layout_StyleBasicShape() {
     assert_eq!(::std::mem::size_of::<StyleBasicShape>() , 120usize);
     assert_eq!(::std::mem::align_of::<StyleBasicShape>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct StyleShapeSource<ReferenceBox> {
-    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_250063<ReferenceBox>,
+    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_1<ReferenceBox>,
     pub mType: StyleShapeSourceType,
     pub mReferenceBox: ReferenceBox,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct StyleShapeSource__bindgen_ty_bindgen_id_250063<ReferenceBox> {
+pub struct StyleShapeSource__bindgen_ty_1<ReferenceBox> {
     pub mBasicShape: __BindgenUnionField<*mut StyleBasicShape>,
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub bindgen_union_field: u64,
     pub _phantom_0: ::std::marker::PhantomData<ReferenceBox>,
 }
 pub type StyleClipPath = StyleShapeSource<StyleClipPathGeometryBox>;
 pub type StyleShapeOutside = StyleShapeSource<StyleShapeOutsideShapeBox>;
 #[repr(C)]
@@ -11924,35 +11792,35 @@ pub enum nsStyleContentType {
     eStyleContentType_NoCloseQuote = 43,
     eStyleContentType_AltContent = 50,
     eStyleContentType_Uninitialized = 51,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleContentData {
     pub mType: nsStyleContentType,
-    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_250165,
+    pub mContent: nsStyleContentData__bindgen_ty_1,
     pub mImageTracked: bool,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleContentData__bindgen_ty_bindgen_id_250165 {
+pub struct nsStyleContentData__bindgen_ty_1 {
     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_250165() {
-    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_250165>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_250165>()
-               , 8usize);
-}
-impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_250165 {
+fn bindgen_test_layout_nsStyleContentData__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_1>() ,
+               8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleContentData__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleContentData() {
     assert_eq!(::std::mem::size_of::<nsStyleContentData>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsStyleContentData>() , 8usize);
 }
 #[repr(C)]
@@ -12043,20 +11911,17 @@ pub struct nsStyleColumn {
     pub mColumnWidth: nsStyleCoord,
     pub mColumnGap: nsStyleCoord,
     pub mColumnRuleColor: StyleComplexColor,
     pub mColumnRuleStyle: u8,
     pub mColumnFill: u8,
     pub mColumnRuleWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
-extern "C" {
-    #[link_name = "_ZN13nsStyleColumn15kMaxColumnCountE"]
-    pub static nsStyleColumn_kMaxColumnCount: u32;
-}
+pub const nsStyleColumn_kMaxColumnCount: u32 = 1000;
 #[test]
 fn bindgen_test_layout_nsStyleColumn() {
     assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 64usize);
     assert_eq!(::std::mem::align_of::<nsStyleColumn>() , 8usize);
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsStyleSVGPaintType {
@@ -12064,35 +11929,35 @@ pub enum nsStyleSVGPaintType {
     eStyleSVGPaintType_Color = 2,
     eStyleSVGPaintType_Server = 3,
     eStyleSVGPaintType_ContextFill = 4,
     eStyleSVGPaintType_ContextStroke = 5,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleSVGPaint {
-    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_250655,
+    pub mPaint: nsStyleSVGPaint__bindgen_ty_1,
     pub mType: nsStyleSVGPaintType,
     pub mFallbackColor: nscolor,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_250655 {
+pub struct nsStyleSVGPaint__bindgen_ty_1 {
     pub mColor: __BindgenUnionField<nscolor>,
     pub mPaintServer: __BindgenUnionField<*mut URLValue>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_250655() {
-    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_250655>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_250655>()
-               , 8usize);
-}
-impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_250655 {
+fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_1>() ,
+               8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleSVGPaint__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleSVGPaint() {
     assert_eq!(::std::mem::size_of::<nsStyleSVGPaint>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsStyleSVGPaint>() , 8usize);
 }
 #[repr(C)]
@@ -12115,40 +11980,33 @@ pub struct nsStyleSVG {
     pub mFillRule: StyleFillRule,
     pub mPaintOrder: u8,
     pub mShapeRendering: u8,
     pub mStrokeLinecap: u8,
     pub mStrokeLinejoin: u8,
     pub mTextAnchor: u8,
     pub mContextFlags: u8,
 }
-pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::FILL_OPACITY_SOURCE_MASK;
-pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::STROKE_OPACITY_SOURCE_MASK;
-pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::STROKE_DASHARRAY_CONTEXT;
-pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::STROKE_DASHOFFSET_CONTEXT;
-pub const nsStyleSVG_STROKE_WIDTH_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::STROKE_WIDTH_CONTEXT;
-pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::FILL_OPACITY_SOURCE_SHIFT;
-pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT:
-          nsStyleSVG__bindgen_ty_bindgen_id_250824 =
-    nsStyleSVG__bindgen_ty_bindgen_id_250824::STROKE_OPACITY_SOURCE_SHIFT;
+pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::FILL_OPACITY_SOURCE_MASK;
+pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_OPACITY_SOURCE_MASK;
+pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_DASHARRAY_CONTEXT;
+pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_DASHOFFSET_CONTEXT;
+pub const nsStyleSVG_STROKE_WIDTH_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_WIDTH_CONTEXT;
+pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::FILL_OPACITY_SOURCE_SHIFT;
+pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_OPACITY_SOURCE_SHIFT;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleSVG__bindgen_ty_bindgen_id_250824 {
+pub enum nsStyleSVG__bindgen_ty_1 {
     FILL_OPACITY_SOURCE_MASK = 3,
     STROKE_OPACITY_SOURCE_MASK = 12,
     STROKE_DASHARRAY_CONTEXT = 16,
     STROKE_DASHOFFSET_CONTEXT = 32,
     STROKE_WIDTH_CONTEXT = 64,
     FILL_OPACITY_SOURCE_SHIFT = 0,
     STROKE_OPACITY_SOURCE_SHIFT = 2,
 }
@@ -12157,33 +12015,32 @@ fn bindgen_test_layout_nsStyleSVG() {
     assert_eq!(::std::mem::size_of::<nsStyleSVG>() , 120usize);
     assert_eq!(::std::mem::align_of::<nsStyleSVG>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleFilter {
     pub mType: u32,
     pub mFilterParameter: nsStyleCoord,
-    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_250899,
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsStyleFilter__bindgen_ty_bindgen_id_250899 {
+    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_1,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleFilter__bindgen_ty_1 {
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub mDropShadow: __BindgenUnionField<*mut nsCSSShadowArray>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_250899() {
-    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_250899>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_250899>()
-               , 8usize);
-}
-impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_250899 {
+fn bindgen_test_layout_nsStyleFilter__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleFilter__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleFilter() {
     assert_eq!(::std::mem::size_of::<nsStyleFilter>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsStyleFilter>() , 8usize);
 }
 #[repr(C)]
--- a/servo/components/style/gecko_bindings/structs_release.rs
+++ b/servo/components/style/gecko_bindings/structs_release.rs
@@ -2,17 +2,16 @@
 
 use atomic_refcell::AtomicRefCell;
 use data::ElementData;
 pub use nsstring::nsStringRepr as nsString;
 pub type ServoUnsafeCell<T> = ::std::cell::UnsafeCell<T>;
 pub type ServoCell<T> = ::std::cell::Cell<T>;
 pub type ServoNodeData = AtomicRefCell<ElementData>;
 
-#[derive(Debug)]
 #[repr(C)]
 pub struct __BindgenUnionField<T>(::std::marker::PhantomData<T>);
 impl <T> __BindgenUnionField<T> {
     #[inline]
     pub fn new() -> Self { __BindgenUnionField(::std::marker::PhantomData) }
     #[inline]
     pub unsafe fn as_ref(&self) -> &T { ::std::mem::transmute(self) }
     #[inline]
@@ -22,16 +21,21 @@ impl <T> ::std::default::Default for __B
     #[inline]
     fn default() -> Self { Self::new() }
 }
 impl <T> ::std::clone::Clone for __BindgenUnionField<T> {
     #[inline]
     fn clone(&self) -> Self { Self::new() }
 }
 impl <T> ::std::marker::Copy for __BindgenUnionField<T> { }
+impl <T> ::std::fmt::Debug for __BindgenUnionField<T> {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        fmt.write_str("__BindgenUnionField")
+    }
+}
 pub const NS_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
 pub const NS_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
 pub const NS_FONT_WEIGHT_THIN: ::std::os::raw::c_uint = 100;
 pub const NS_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
 pub const NS_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
@@ -49,61 +53,23 @@ pub const NS_FONT_KERNING_NONE: ::std::o
 pub const NS_FONT_KERNING_NORMAL: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_SYNTHESIS_WEIGHT: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_SYNTHESIS_STYLE: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_DISPLAY_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_DISPLAY_BLOCK: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_DISPLAY_SWAP: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_DISPLAY_FALLBACK: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_DISPLAY_OPTIONAL: ::std::os::raw::c_uint = 4;
-pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_STYLESET: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT: ::std::os::raw::c_uint
-          =
-    1;
-pub const NS_FONT_VARIANT_ALTERNATES_SWASH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_CAPS_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_CAPS_SMALLCAPS: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_CAPS_ALLSMALL: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_CAPS_PETITECAPS: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_VARIANT_CAPS_ALLPETITE: ::std::os::raw::c_uint = 4;
 pub const NS_FONT_VARIANT_CAPS_TITLING: ::std::os::raw::c_uint = 5;
 pub const NS_FONT_VARIANT_CAPS_UNICASE: ::std::os::raw::c_uint = 6;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NONE: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_COMMON: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_LINING: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_TABULAR: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS: ::std::os::raw::c_uint =
-    1;
-pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO: ::std::os::raw::c_uint = 1;
-pub const NS_FONT_VARIANT_NUMERIC_ORDINAL: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_POSITION_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_POSITION_SUPER: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_POSITION_SUB: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_WIDTH_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_VARIANT_WIDTH_FULL: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_VARIANT_WIDTH_HALF: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_VARIANT_WIDTH_THIRD: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_VARIANT_WIDTH_QUARTER: ::std::os::raw::c_uint = 4;
@@ -288,21 +254,21 @@ pub const NS_STYLE_SPEECH_RATE_SLOWER: :
 pub const NS_STYLE_VOLUME_SILENT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_VOLUME_X_SOFT: ::std::os::raw::c_uint = 1;
 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_INHERIT_FROM_BODY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_WILL_CHANGE_STACKING_CONTEXT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_TRANSFORM: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_SCROLL: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_OPACITY: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_WILL_CHANGE_TRANSFORM: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_WILL_CHANGE_SCROLL: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_WILL_CHANGE_OPACITY: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_WILL_CHANGE_FIXPOS_CB: ::std::os::raw::c_uint = 16;
+pub const NS_STYLE_WILL_CHANGE_ABSPOS_CB: ::std::os::raw::c_uint = 32;
 pub const NS_STYLE_ANIMATION_ITERATION_COUNT_INFINITE: ::std::os::raw::c_uint
           =
     0;
 pub const NS_STYLE_ANIMATION_PLAY_STATE_RUNNING: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ANIMATION_PLAY_STATE_PAUSED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_SCROLL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_FIXED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ATTACHMENT_LOCAL: ::std::os::raw::c_uint = 2;
@@ -312,20 +278,20 @@ pub const NS_STYLE_IMAGELAYER_CLIP_CONTE
 pub const NS_STYLE_IMAGELAYER_CLIP_TEXT: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_IMAGELAYER_CLIP_MOZ_ALMOST_PADDING: ::std::os::raw::c_uint
           =
     127;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_BORDER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_PADDING: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_ORIGIN_CONTENT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_IMAGELAYER_POSITION_CENTER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_TOP: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_IMAGELAYER_POSITION_TOP: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_IMAGELAYER_POSITION_BOTTOM: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_IMAGELAYER_POSITION_LEFT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_IMAGELAYER_POSITION_RIGHT: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_X: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT_Y: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_IMAGELAYER_REPEAT_REPEAT: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_IMAGELAYER_REPEAT_SPACE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_IMAGELAYER_REPEAT_ROUND: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_IMAGELAYER_SIZE_CONTAIN: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_IMAGELAYER_SIZE_COVER: ::std::os::raw::c_uint = 1;
@@ -399,21 +365,24 @@ pub const NS_STYLE_CURSOR_NS_RESIZE: ::s
 pub const NS_STYLE_CURSOR_EW_RESIZE: ::std::os::raw::c_uint = 35;
 pub const NS_STYLE_CURSOR_NONE: ::std::os::raw::c_uint = 36;
 pub const NS_STYLE_DIRECTION_LTR: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_DIRECTION_RTL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WRITING_MODE_HORIZONTAL_TB: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_WRITING_MODE_VERTICAL_RL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WRITING_MODE_VERTICAL_LR: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_WRITING_MODE_SIDEWAYS_MASK: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_WRITING_MODE_SIDEWAYS_RL: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_WRITING_MODE_SIDEWAYS_LR: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_CONTAIN_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_CONTAIN_STRICT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_CONTAIN_LAYOUT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_CONTAIN_STYLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_CONTAIN_PAINT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_CONTAIN_ALL_BITS: ::std::os::raw::c_uint = 14;
 pub const NS_STYLE_ALIGN_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ALIGN_NORMAL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_ALIGN_START: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ALIGN_END: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_ALIGN_FLEX_START: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_ALIGN_FLEX_END: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_ALIGN_CENTER: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_ALIGN_LEFT: ::std::os::raw::c_uint = 7;
@@ -427,48 +396,90 @@ pub const NS_STYLE_ALIGN_SPACE_BETWEEN: 
 pub const NS_STYLE_ALIGN_SPACE_AROUND: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_ALIGN_SPACE_EVENLY: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_ALIGN_LEGACY: ::std::os::raw::c_uint = 32;
 pub const NS_STYLE_ALIGN_SAFE: ::std::os::raw::c_uint = 64;
 pub const NS_STYLE_ALIGN_UNSAFE: ::std::os::raw::c_uint = 128;
 pub const NS_STYLE_ALIGN_FLAG_BITS: ::std::os::raw::c_uint = 224;
 pub const NS_STYLE_ALIGN_ALL_BITS: ::std::os::raw::c_uint = 255;
 pub const NS_STYLE_ALIGN_ALL_SHIFT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_JUSTIFY_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_JUSTIFY_NORMAL: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_JUSTIFY_START: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_JUSTIFY_END: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_JUSTIFY_FLEX_START: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_JUSTIFY_FLEX_END: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_JUSTIFY_CENTER: ::std::os::raw::c_uint = 6;
+pub const NS_STYLE_JUSTIFY_LEFT: ::std::os::raw::c_uint = 7;
+pub const NS_STYLE_JUSTIFY_RIGHT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_JUSTIFY_BASELINE: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_JUSTIFY_LAST_BASELINE: ::std::os::raw::c_uint = 10;
+pub const NS_STYLE_JUSTIFY_STRETCH: ::std::os::raw::c_uint = 11;
+pub const NS_STYLE_JUSTIFY_SELF_START: ::std::os::raw::c_uint = 12;
+pub const NS_STYLE_JUSTIFY_SELF_END: ::std::os::raw::c_uint = 13;
+pub const NS_STYLE_JUSTIFY_SPACE_BETWEEN: ::std::os::raw::c_uint = 14;
+pub const NS_STYLE_JUSTIFY_SPACE_AROUND: ::std::os::raw::c_uint = 15;
+pub const NS_STYLE_JUSTIFY_SPACE_EVENLY: ::std::os::raw::c_uint = 16;
+pub const NS_STYLE_JUSTIFY_LEGACY: ::std::os::raw::c_uint = 32;
+pub const NS_STYLE_JUSTIFY_SAFE: ::std::os::raw::c_uint = 64;
+pub const NS_STYLE_JUSTIFY_UNSAFE: ::std::os::raw::c_uint = 128;
+pub const NS_STYLE_JUSTIFY_FLAG_BITS: ::std::os::raw::c_uint = 224;
+pub const NS_STYLE_JUSTIFY_ALL_BITS: ::std::os::raw::c_uint = 255;
+pub const NS_STYLE_JUSTIFY_ALL_SHIFT: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FLEX_DIRECTION_ROW: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FLEX_DIRECTION_ROW_REVERSE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FLEX_DIRECTION_COLUMN: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FLEX_DIRECTION_COLUMN_REVERSE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FLEX_WRAP_NOWRAP: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FLEX_WRAP_WRAP: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FLEX_WRAP_WRAP_REVERSE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ORDER_INITIAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_START: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_JUSTIFY_CONTENT_FLEX_END: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_JUSTIFY_CONTENT_CENTER: ::std::os::raw::c_uint = 6;
+pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_BETWEEN: ::std::os::raw::c_uint = 14;
+pub const NS_STYLE_JUSTIFY_CONTENT_SPACE_AROUND: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_FILTER_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FILTER_URL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FILTER_BLUR: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FILTER_BRIGHTNESS: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FILTER_CONTRAST: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FILTER_GRAYSCALE: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FILTER_INVERT: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FILTER_OPACITY: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FILTER_SATURATE: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FILTER_SEPIA: ::std::os::raw::c_uint = 9;
 pub const NS_STYLE_FILTER_HUE_ROTATE: ::std::os::raw::c_uint = 10;
 pub const NS_STYLE_FILTER_DROP_SHADOW: ::std::os::raw::c_uint = 11;
+pub const NS_STYLE_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
+pub const NS_STYLE_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
 pub const NS_STYLE_FONT_WEIGHT_BOLDER: ::std::os::raw::c_int = -1;
 pub const NS_STYLE_FONT_WEIGHT_LIGHTER: ::std::os::raw::c_int = -2;
 pub const NS_STYLE_FONT_SIZE_XXSMALL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_FONT_SIZE_XSMALL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FONT_SIZE_SMALL: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FONT_SIZE_MEDIUM: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FONT_SIZE_LARGE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_SIZE_XLARGE: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FONT_SIZE_XXLARGE: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FONT_SIZE_XXXLARGE: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FONT_SIZE_LARGER: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_FONT_SIZE_SMALLER: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
+pub const NS_STYLE_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
+pub const NS_STYLE_FONT_STRETCH_CONDENSED: ::std::os::raw::c_int = -2;
+pub const NS_STYLE_FONT_STRETCH_SEMI_CONDENSED: ::std::os::raw::c_int = -1;
+pub const NS_STYLE_FONT_STRETCH_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_STYLE_FONT_STRETCH_SEMI_EXPANDED: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_FONT_STRETCH_EXPANDED: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_FONT_STRETCH_EXTRA_EXPANDED: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_CAPTION: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_FONT_ICON: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_FONT_MENU: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_FONT_MESSAGE_BOX: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_FONT_SMALL_CAPTION: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_FONT_STATUS_BAR: ::std::os::raw::c_uint = 6;
 pub const NS_STYLE_FONT_WINDOW: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_FONT_DOCUMENT: ::std::os::raw::c_uint = 8;
@@ -476,18 +487,18 @@ pub const NS_STYLE_FONT_WORKSPACE: ::std
 pub const NS_STYLE_FONT_DESKTOP: ::std::os::raw::c_uint = 10;
 pub const NS_STYLE_FONT_INFO: ::std::os::raw::c_uint = 11;
 pub const NS_STYLE_FONT_DIALOG: ::std::os::raw::c_uint = 12;
 pub const NS_STYLE_FONT_BUTTON: ::std::os::raw::c_uint = 13;
 pub const NS_STYLE_FONT_PULL_DOWN_MENU: ::std::os::raw::c_uint = 14;
 pub const NS_STYLE_FONT_LIST: ::std::os::raw::c_uint = 15;
 pub const NS_STYLE_FONT_FIELD: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_GRID_AUTO_FLOW_ROW: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_GRID_AUTO_FLOW_DENSE: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_GRID_AUTO_FLOW_COLUMN: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_GRID_AUTO_FLOW_DENSE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_GRID_TEMPLATE_SUBGRID: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_GRID_TRACK_BREADTH_MAX_CONTENT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_GRID_TRACK_BREADTH_MIN_CONTENT: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_GRID_REPEAT_AUTO_FILL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_GRID_REPEAT_AUTO_FIT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WIDTH_MAX_CONTENT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_WIDTH_MIN_CONTENT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_WIDTH_FIT_CONTENT: ::std::os::raw::c_uint = 2;
@@ -599,35 +610,38 @@ pub const NS_STYLE_TEXT_DECORATION_LINE_
 pub const NS_STYLE_TEXT_DECORATION_LINE_OVERLINE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH: ::std::os::raw::c_uint =
     4;
 pub const NS_STYLE_TEXT_DECORATION_LINE_BLINK: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS: ::std::os::raw::c_uint =
     16;
 pub const NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL: ::std::os::raw::c_uint =
     32;
+pub const NS_STYLE_TEXT_DECORATION_LINE_LINES_MASK: ::std::os::raw::c_uint =
+    7;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DOTTED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DASHED: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_SOLID: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TEXT_DECORATION_STYLE_WAVY: ::std::os::raw::c_uint = 5;
+pub const NS_STYLE_TEXT_DECORATION_STYLE_MAX: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_TEXT_OVERFLOW_CLIP: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_OVERFLOW_ELLIPSIS: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_OVERFLOW_STRING: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_TRANSFORM_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_TRANSFORM_CAPITALIZE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_TRANSFORM_LOWERCASE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_TRANSFORM_UPPERCASE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_TEXT_TRANSFORM_FULL_WIDTH: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TOUCH_ACTION_NONE: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_AUTO: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_PAN_X: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_PAN_Y: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TOUCH_ACTION_AUTO: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_TOUCH_ACTION_PAN_X: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_TOUCH_ACTION_PAN_Y: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 16;
 pub const NS_STYLE_TOP_LAYER_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TOP_LAYER_TOP: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TRANSFORM_BOX_BORDER_BOX: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TRANSFORM_BOX_FILL_BOX: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TRANSFORM_BOX_VIEW_BOX: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE: ::std::os::raw::c_uint =
     0;
 pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_LINEAR: ::std::os::raw::c_uint =
@@ -763,16 +777,17 @@ pub const NS_STYLE_IMAGE_RENDERING_OPTIM
     2;
 pub const NS_STYLE_IMAGE_RENDERING_CRISPEDGES: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_MASK_TYPE_LUMINANCE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_MASK_TYPE_ALPHA: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_PAINT_ORDER_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_PAINT_ORDER_FILL: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_PAINT_ORDER_STROKE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_PAINT_ORDER_MARKERS: ::std::os::raw::c_uint = 3;
+pub const NS_STYLE_PAINT_ORDER_LAST_VALUE: ::std::os::raw::c_uint = 3;
 pub const NS_STYLE_PAINT_ORDER_BITWIDTH: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_SHAPE_RENDERING_AUTO: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_SHAPE_RENDERING_OPTIMIZESPEED: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_SHAPE_RENDERING_CRISPEDGES: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_SHAPE_RENDERING_GEOMETRICPRECISION: ::std::os::raw::c_uint
           =
     3;
 pub const NS_STYLE_STROKE_LINECAP_BUTT: ::std::os::raw::c_uint = 0;
@@ -781,23 +796,26 @@ pub const NS_STYLE_STROKE_LINECAP_SQUARE
 pub const NS_STYLE_STROKE_LINEJOIN_MITER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_STROKE_LINEJOIN_ROUND: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_STROKE_LINEJOIN_BEVEL: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_STROKE_PROP_CONTEXT_VALUE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_ANCHOR_START: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_TEXT_ANCHOR_MIDDLE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_ANCHOR_END: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_EMPHASIS_POSITION_OVER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER: ::std::os::raw::c_uint = 2;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT: ::std::os::raw::c_uint = 4;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT: ::std::os::raw::c_uint = 8;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT: ::std::os::raw::c_uint = 9;
+pub const NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH: ::std::os::raw::c_uint =
+    10;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_NONE: ::std::os::raw::c_uint = 0;
-pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILL_MASK: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED: ::std::os::raw::c_uint = 0;
-pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN: ::std::os::raw::c_uint = 1;
+pub const NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN: ::std::os::raw::c_uint = 8;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SHAPE_MASK: ::std::os::raw::c_uint = 7;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_CIRCLE: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_DOUBLE_CIRCLE: ::std::os::raw::c_uint =
     3;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_TRIANGLE: ::std::os::raw::c_uint = 4;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_SESAME: ::std::os::raw::c_uint = 5;
 pub const NS_STYLE_TEXT_EMPHASIS_STYLE_STRING: ::std::os::raw::c_uint = 255;
@@ -867,21 +885,17 @@ pub const NS_STYLE_SCROLL_SNAP_TYPE_MAND
 pub const NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY: ::std::os::raw::c_uint = 2;
 pub const NS_STYLE_ORIENTATION_PORTRAIT: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_ORIENTATION_LANDSCAPE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_SCAN_PROGRESSIVE: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_SCAN_INTERLACE: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_DISPLAY_MODE_BROWSER: ::std::os::raw::c_uint = 0;
 pub const NS_STYLE_DISPLAY_MODE_MINIMAL_UI: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_DISPLAY_MODE_STANDALONE: ::std::os::raw::c_uint = 2;
-pub const NS_STYLE_DISPLAY_MODE_FULLSCREEN: ::std::os::raw::c_uint = 3;
-pub const NS_STYLE_INHERIT_BIT: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_INHERIT_MASK: ::std::os::raw::c_uint = 16777215;
-pub const NS_STYLE_INHERITED_STRUCT_MASK: ::std::os::raw::c_uint = 1;
-pub const NS_STYLE_RESET_STRUCT_MASK: ::std::os::raw::c_uint = 1;
 pub const NS_STYLE_HAS_TEXT_DECORATION_LINES: ::std::os::raw::c_uint =
     16777216;
 pub const NS_STYLE_HAS_PSEUDO_ELEMENT_DATA: ::std::os::raw::c_uint = 33554432;
 pub const NS_STYLE_RELEVANT_LINK_VISITED: ::std::os::raw::c_uint = 67108864;
 pub const NS_STYLE_IS_STYLE_IF_VISITED: ::std::os::raw::c_uint = 134217728;
 pub const NS_STYLE_CHILD_USES_GRANDANCESTOR_STYLE: ::std::os::raw::c_uint =
     268435456;
 pub const NS_STYLE_IS_SHARED: ::std::os::raw::c_uint = 536870912;
@@ -1539,40 +1553,38 @@ impl Clone for JSObject {
 pub struct Value {
     pub data: Value_layout,
 }
 pub type Value_PayloadType = u64;
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct Value_layout {
     pub asBits: __BindgenUnionField<u64>,
-    pub debugView: __BindgenUnionField<Value_layout__bindgen_ty_bindgen_id_55111>,
-    pub s: __BindgenUnionField<Value_layout__bindgen_ty_bindgen_id_55117>,
+    pub debugView: __BindgenUnionField<Value_layout__bindgen_ty_1>,
+    pub s: __BindgenUnionField<Value_layout__bindgen_ty_2>,
     pub asDouble: __BindgenUnionField<f64>,
     pub asPtr: __BindgenUnionField<*mut ::std::os::raw::c_void>,
     pub asWord: __BindgenUnionField<usize>,
     pub asUIntPtr: __BindgenUnionField<usize>,
     pub bindgen_union_field: u64,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_55111 {
+pub struct Value_layout__bindgen_ty_1 {
     pub _bitfield_1: u64,
 }
 #[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_55111() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_55111>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_55111>()
-               , 8usize);
-}
-impl Clone for Value_layout__bindgen_ty_bindgen_id_55111 {
-    fn clone(&self) -> Self { *self }
-}
-impl Value_layout__bindgen_ty_bindgen_id_55111 {
+fn bindgen_test_layout_Value_layout__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_1>() , 8usize);
+}
+impl Clone for Value_layout__bindgen_ty_1 {
+    fn clone(&self) -> Self { *self }
+}
+impl Value_layout__bindgen_ty_1 {
     #[inline]
     pub fn payload47(&self) -> u64 {
         unsafe {
             ::std::mem::transmute(((self._bitfield_1 &
                                         (140737488355327usize as u64)) >>
                                        0u32) as u64)
         }
     }
@@ -1595,46 +1607,43 @@ impl Value_layout__bindgen_ty_bindgen_id
         self._bitfield_1 &= !(18446603336221196288usize as u64);
         self._bitfield_1 |=
             ((val as u32 as u64) << 47u32) &
                 (18446603336221196288usize as u64);
     }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_55117 {
-    pub payload: Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118,
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118 {
+pub struct Value_layout__bindgen_ty_2 {
+    pub payload: Value_layout__bindgen_ty_2_1,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct Value_layout__bindgen_ty_2_1 {
     pub i32: __BindgenUnionField<i32>,
     pub u32: __BindgenUnionField<u32>,
     pub why: __BindgenUnionField<JSWhyMagic>,
     pub bindgen_union_field: u32,
 }
 #[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118>()
-               , 4usize);
-}
-impl Clone for
- Value_layout__bindgen_ty_bindgen_id_55117__bindgen_ty_bindgen_id_55118 {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_Value_layout__bindgen_ty_bindgen_id_55117() {
-    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_bindgen_id_55117>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_bindgen_id_55117>()
-               , 4usize);
-}
-impl Clone for Value_layout__bindgen_ty_bindgen_id_55117 {
+fn bindgen_test_layout_Value_layout__bindgen_ty_2_1() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_2_1>() ,
+               4usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_2_1>() ,
+               4usize);
+}
+impl Clone for Value_layout__bindgen_ty_2_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_Value_layout__bindgen_ty_2() {
+    assert_eq!(::std::mem::size_of::<Value_layout__bindgen_ty_2>() , 4usize);
+    assert_eq!(::std::mem::align_of::<Value_layout__bindgen_ty_2>() , 4usize);
+}
+impl Clone for Value_layout__bindgen_ty_2 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_Value_layout() {
     assert_eq!(::std::mem::size_of::<Value_layout>() , 8usize);
     assert_eq!(::std::mem::align_of::<Value_layout>() , 8usize);
 }
 impl Clone for Value_layout {
@@ -1713,43 +1722,35 @@ pub type nsAString_internal_string_type 
 pub type nsAString_internal_const_iterator = nsReadingIterator<u16>;
 pub type nsAString_internal_iterator = nsWritingIterator<u16>;
 pub type nsAString_internal_comparator_type = nsStringComparator;
 pub type nsAString_internal_char_iterator = *mut nsAString_internal_char_type;
 pub type nsAString_internal_const_char_iterator =
     *const nsAString_internal_char_type;
 pub type nsAString_internal_size_type = u32;
 pub type nsAString_internal_index_type = u32;
-pub const nsAString_internal_F_NONE:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_NONE;
-pub const nsAString_internal_F_TERMINATED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_TERMINATED;
-pub const nsAString_internal_F_VOIDED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_VOIDED;
-pub const nsAString_internal_F_SHARED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_SHARED;
-pub const nsAString_internal_F_OWNED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_OWNED;
-pub const nsAString_internal_F_FIXED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_FIXED;
-pub const nsAString_internal_F_LITERAL:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_LITERAL;
-pub const nsAString_internal_F_CLASS_FIXED:
-          nsAString_internal__bindgen_ty_bindgen_id_69918 =
-    nsAString_internal__bindgen_ty_bindgen_id_69918::F_CLASS_FIXED;
+pub const nsAString_internal_F_NONE: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_NONE;
+pub const nsAString_internal_F_TERMINATED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_TERMINATED;
+pub const nsAString_internal_F_VOIDED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_VOIDED;
+pub const nsAString_internal_F_SHARED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_SHARED;
+pub const nsAString_internal_F_OWNED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_OWNED;
+pub const nsAString_internal_F_FIXED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_FIXED;
+pub const nsAString_internal_F_LITERAL: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_LITERAL;
+pub const nsAString_internal_F_CLASS_FIXED: nsAString_internal__bindgen_ty_1 =
+    nsAString_internal__bindgen_ty_1::F_CLASS_FIXED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsAString_internal__bindgen_ty_bindgen_id_69918 {
+pub enum nsAString_internal__bindgen_ty_1 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
     F_SHARED = 4,
     F_OWNED = 8,
     F_FIXED = 16,
     F_LITERAL = 32,
     F_CLASS_FIXED = 65536,
@@ -1776,22 +1777,22 @@ pub type nsSubstringTuple_size_type = u3
 fn bindgen_test_layout_nsSubstringTuple() {
     assert_eq!(::std::mem::size_of::<nsSubstringTuple>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsSubstringTuple>() , 8usize);
 }
 impl Clone for nsSubstringTuple {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_70528 {
+pub struct nsStringComparator__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_70528,
+    pub vtable_: *const nsStringComparator__bindgen_vtable,
 }
 pub type nsStringComparator_char_type = u16;
 #[test]
 fn bindgen_test_layout_nsStringComparator() {
     assert_eq!(::std::mem::size_of::<nsStringComparator>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsStringComparator>() , 8usize);
 }
 impl Clone for nsStringComparator {
@@ -1821,43 +1822,37 @@ pub type nsACString_internal_iterator =
     nsWritingIterator<::std::os::raw::c_char>;
 pub type nsACString_internal_comparator_type = nsCStringComparator;
 pub type nsACString_internal_char_iterator =
     *mut nsACString_internal_char_type;
 pub type nsACString_internal_const_char_iterator =
     *const nsACString_internal_char_type;
 pub type nsACString_internal_size_type = u32;
 pub type nsACString_internal_index_type = u32;
-pub const nsACString_internal_F_NONE:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_NONE;
-pub const nsACString_internal_F_TERMINATED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_TERMINATED;
-pub const nsACString_internal_F_VOIDED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_VOIDED;
-pub const nsACString_internal_F_SHARED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_SHARED;
-pub const nsACString_internal_F_OWNED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_OWNED;
-pub const nsACString_internal_F_FIXED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_FIXED;
-pub const nsACString_internal_F_LITERAL:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_LITERAL;
-pub const nsACString_internal_F_CLASS_FIXED:
-          nsACString_internal__bindgen_ty_bindgen_id_71758 =
-    nsACString_internal__bindgen_ty_bindgen_id_71758::F_CLASS_FIXED;
+pub const nsACString_internal_F_NONE: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_NONE;
+pub const nsACString_internal_F_TERMINATED: nsACString_internal__bindgen_ty_1
+          =
+    nsACString_internal__bindgen_ty_1::F_TERMINATED;
+pub const nsACString_internal_F_VOIDED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_VOIDED;
+pub const nsACString_internal_F_SHARED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_SHARED;
+pub const nsACString_internal_F_OWNED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_OWNED;
+pub const nsACString_internal_F_FIXED: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_FIXED;
+pub const nsACString_internal_F_LITERAL: nsACString_internal__bindgen_ty_1 =
+    nsACString_internal__bindgen_ty_1::F_LITERAL;
+pub const nsACString_internal_F_CLASS_FIXED: nsACString_internal__bindgen_ty_1
+          =
+    nsACString_internal__bindgen_ty_1::F_CLASS_FIXED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsACString_internal__bindgen_ty_bindgen_id_71758 {
+pub enum nsACString_internal__bindgen_ty_1 {
     F_NONE = 0,
     F_TERMINATED = 1,
     F_VOIDED = 2,
     F_SHARED = 4,
     F_OWNED = 8,
     F_FIXED = 16,
     F_LITERAL = 32,
     F_CLASS_FIXED = 65536,
@@ -1909,45 +1904,45 @@ impl Clone for nsCString_Segment {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsCString() {
     assert_eq!(::std::mem::size_of::<nsCString>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsCString>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_72310 {
+pub struct nsCStringComparator__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCStringComparator {
-    pub vtable_: *const bindgen_vtable__bindgen_id_72310,
+    pub vtable_: *const nsCStringComparator__bindgen_vtable,
 }
 pub type nsCStringComparator_char_type = ::std::os::raw::c_char;
 #[test]
 fn bindgen_test_layout_nsCStringComparator() {
     assert_eq!(::std::mem::size_of::<nsCStringComparator>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsCStringComparator>() , 8usize);
 }
 impl Clone for nsCStringComparator {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_72614 {
+pub struct nsISupports__bindgen_vtable {
 }
 /**
  * Basic component object model interface. Objects which implement
  * this interface support runtime interface discovery (QueryInterface)
  * and a reference counted memory model (AddRef/Release). This is
  * modelled after the win32 IUnknown API.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsISupports {
-    pub vtable_: *const bindgen_vtable__bindgen_id_72614,
+    pub vtable_: *const nsISupports__bindgen_vtable,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsISupports_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
@@ -1955,25 +1950,25 @@ pub struct nsISupports_COMTypeInfo<T, U>
 fn bindgen_test_layout_nsISupports() {
     assert_eq!(::std::mem::size_of::<nsISupports>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsISupports>() , 8usize);
 }
 impl Clone for nsISupports {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_72898 {
+pub struct nsCycleCollectionParticipant__bindgen_vtable {
 }
 /**
  * Participant implementation classes
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsCycleCollectionParticipant {
-    pub vtable_: *const bindgen_vtable__bindgen_id_72898,
+    pub vtable_: *const nsCycleCollectionParticipant__bindgen_vtable,
     pub mMightSkip: bool,
 }
 #[test]
 fn bindgen_test_layout_nsCycleCollectionParticipant() {
     assert_eq!(::std::mem::size_of::<nsCycleCollectionParticipant>() ,
                16usize);
     assert_eq!(::std::mem::align_of::<nsCycleCollectionParticipant>() ,
                8usize);
@@ -2257,34 +2252,34 @@ fn bindgen_test_layout_ErrorResult() {
  * A cleanup policy consists of two booleans: whether to assert that we've been
  * reported or suppressed, and whether to then go ahead and suppress the
  * exception.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct TErrorResult<CleanupPolicy> {
     pub mResult: nsresult,
-    pub __bindgen_anon_1: TErrorResult__bindgen_ty_bindgen_id_77325<CleanupPolicy>,
+    pub __bindgen_anon_1: TErrorResult__bindgen_ty_1<CleanupPolicy>,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct TErrorResult_Message<CleanupPolicy> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct TErrorResult_DOMExceptionInfo<CleanupPolicy> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct TErrorResult__bindgen_ty_bindgen_id_77325<CleanupPolicy> {
+pub struct TErrorResult__bindgen_ty_1<CleanupPolicy> {
     pub mMessage: __BindgenUnionField<*mut TErrorResult_Message<CleanupPolicy>>,
     pub mJSException: __BindgenUnionField<Value>,
     pub mDOMExceptionInfo: __BindgenUnionField<*mut TErrorResult_DOMExceptionInfo<CleanupPolicy>>,
     pub bindgen_union_field: u64,
     pub _phantom_0: ::std::marker::PhantomData<CleanupPolicy>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
@@ -2418,31 +2413,27 @@ pub struct nsIPrincipal {
 }
 #[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>,
 }
-pub const nsIPrincipal_APP_STATUS_NOT_INSTALLED:
-          nsIPrincipal__bindgen_ty_bindgen_id_78339 =
-    nsIPrincipal__bindgen_ty_bindgen_id_78339::APP_STATUS_NOT_INSTALLED;
-pub const nsIPrincipal_APP_STATUS_INSTALLED:
-          nsIPrincipal__bindgen_ty_bindgen_id_78339 =
-    nsIPrincipal__bindgen_ty_bindgen_id_78339::APP_STATUS_INSTALLED;
-pub const nsIPrincipal_APP_STATUS_PRIVILEGED:
-          nsIPrincipal__bindgen_ty_bindgen_id_78339 =
-    nsIPrincipal__bindgen_ty_bindgen_id_78339::APP_STATUS_PRIVILEGED;
-pub const nsIPrincipal_APP_STATUS_CERTIFIED:
-          nsIPrincipal__bindgen_ty_bindgen_id_78339 =
-    nsIPrincipal__bindgen_ty_bindgen_id_78339::APP_STATUS_CERTIFIED;
+pub const nsIPrincipal_APP_STATUS_NOT_INSTALLED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_NOT_INSTALLED;
+pub const nsIPrincipal_APP_STATUS_INSTALLED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_INSTALLED;
+pub const nsIPrincipal_APP_STATUS_PRIVILEGED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_PRIVILEGED;
+pub const nsIPrincipal_APP_STATUS_CERTIFIED: nsIPrincipal__bindgen_ty_1 =
+    nsIPrincipal__bindgen_ty_1::APP_STATUS_CERTIFIED;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPrincipal__bindgen_ty_bindgen_id_78339 {
+pub enum nsIPrincipal__bindgen_ty_1 {
     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);
@@ -2467,17 +2458,17 @@ pub struct nsISerializable_COMTypeInfo<T
 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_78507 {
+pub struct nsWrapperCache__bindgen_vtable {
 }
 /**
  * Class to store the wrapper for an object. This can only be used with objects
  * that only have one non-security wrapper at a time (for an XPCWrappedNative
  * this is usually ensured by setting an explicit parent in the PreCreate hook
  * for the class).
  *
  * An instance of nsWrapperCache can be gotten from an object that implements
@@ -2509,67 +2500,59 @@ pub struct bindgen_vtable__bindgen_id_78
  *
  * A number of the methods are implemented in nsWrapperCacheInlines.h because we
  * have to include some JS headers that don't play nicely with the rest of the
  * codebase. Include nsWrapperCacheInlines.h if you need to call those methods.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsWrapperCache {
-    pub vtable_: *const bindgen_vtable__bindgen_id_78507,
+    pub vtable_: *const nsWrapperCache__bindgen_vtable,
     pub mWrapper: *mut JSObject,
     pub mFlags: nsWrapperCache_FlagsType,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsWrapperCache_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub type nsWrapperCache_FlagsType = u32;
-pub const nsWrapperCache_WRAPPER_BIT_PRESERVED:
-          nsWrapperCache__bindgen_ty_bindgen_id_78703 =
-    nsWrapperCache__bindgen_ty_bindgen_id_78703::WRAPPER_BIT_PRESERVED;
+pub const nsWrapperCache_WRAPPER_BIT_PRESERVED: nsWrapperCache__bindgen_ty_1 =
+    nsWrapperCache__bindgen_ty_1::WRAPPER_BIT_PRESERVED;
 #[repr(u32)]
 /**
    * If this bit is set then we're preserving the wrapper, which in effect ties
    * the lifetime of the JS object stored in the cache to the lifetime of the
    * native object. We rely on the cycle collector to break the cycle that this
    * causes between the native object and the JS object, so it is important that
    * any native object that supports preserving of its wrapper
    * traces/traverses/unlinks the cached JS object (see
    * NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER,
    * NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS and
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_78703 {
-    WRAPPER_BIT_PRESERVED = 1,
-}
+pub enum nsWrapperCache__bindgen_ty_1 { WRAPPER_BIT_PRESERVED = 1, }
 pub const nsWrapperCache_WRAPPER_IS_NOT_DOM_BINDING:
-          nsWrapperCache__bindgen_ty_bindgen_id_78706 =
-    nsWrapperCache__bindgen_ty_bindgen_id_78706::WRAPPER_IS_NOT_DOM_BINDING;
+          nsWrapperCache__bindgen_ty_2 =
+    nsWrapperCache__bindgen_ty_2::WRAPPER_IS_NOT_DOM_BINDING;
 #[repr(u32)]
 /**
    * If this bit is set then the wrapper for the native object is not a DOM
    * binding.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_78706 {
-    WRAPPER_IS_NOT_DOM_BINDING = 2,
-}
-pub const nsWrapperCache_kWrapperFlagsMask:
-          nsWrapperCache__bindgen_ty_bindgen_id_78709 =
-    nsWrapperCache__bindgen_ty_bindgen_id_78709::kWrapperFlagsMask;
+pub enum nsWrapperCache__bindgen_ty_2 { WRAPPER_IS_NOT_DOM_BINDING = 2, }
+pub const nsWrapperCache_kWrapperFlagsMask: nsWrapperCache__bindgen_ty_3 =
+    nsWrapperCache__bindgen_ty_3::kWrapperFlagsMask;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsWrapperCache__bindgen_ty_bindgen_id_78709 {
-    kWrapperFlagsMask = 3,
-}
+pub enum nsWrapperCache__bindgen_ty_3 { kWrapperFlagsMask = 3, }
 #[test]
 fn bindgen_test_layout_nsWrapperCache() {
     assert_eq!(::std::mem::size_of::<nsWrapperCache>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsWrapperCache>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct AllOwningUnionBase {
@@ -2634,33 +2617,33 @@ impl Clone for nsXPCOMCycleCollectionPar
 #[derive(Debug, Copy, Clone)]
 pub struct pair<_T1, _T2> {
     pub first: _T1,
     pub second: _T2,
 }
 pub type pair_first_type<_T1> = _T1;
 pub type pair_second_type<_T2> = _T2;
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_127355 {
+pub struct SourceHook__bindgen_vtable {
 }
 /**
  * A class of objects that return source code on demand.
  *
  * When code is compiled with setSourceIsLazy(true), SpiderMonkey doesn't
  * retain the source code (and doesn't do lazy bytecode generation). If we ever
  * need the source code, say, in response to a call to Function.prototype.
  * toSource or Debugger.Source.prototype.text, then we call the 'load' member
  * function of the instance of this class that has hopefully been registered
  * with the runtime, passing the code's URL, and hope that it will be able to
  * find the source.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct SourceHook {
-    pub vtable_: *const bindgen_vtable__bindgen_id_127355,
+    pub vtable_: *const SourceHook__bindgen_vtable,
 }
 #[test]
 fn bindgen_test_layout_SourceHook() {
     assert_eq!(::std::mem::size_of::<SourceHook>() , 8usize);
     assert_eq!(::std::mem::align_of::<SourceHook>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
@@ -3634,17 +3617,17 @@ impl nsIDocument {
 pub struct nsINode {
     pub _base: EventTarget,
     pub mNodeInfo: RefPtr<NodeInfo>,
     pub mParent: *mut nsINode,
     pub mBoolFlags: u32,
     pub mNextSibling: *mut nsIContent,
     pub mPreviousSibling: *mut nsIContent,
     pub mFirstChild: *mut nsIContent,
-    pub __bindgen_anon_1: nsINode__bindgen_ty_bindgen_id_137918,
+    pub __bindgen_anon_1: nsINode__bindgen_ty_1,
     pub mSlots: *mut nsINode_nsSlots,
     pub mServoData: ServoCell<*mut ServoNodeData>,
 }
 pub type nsINode_BoxQuadOptions = BoxQuadOptions;
 pub type nsINode_ConvertCoordinateOptions = ConvertCoordinateOptions;
 pub type nsINode_DOMPoint = DOMPoint;
 pub type nsINode_DOMPointInit = DOMPointInit;
 pub type nsINode_DOMQuad = DOMQuad;
@@ -3654,67 +3637,65 @@ pub type nsINode_TextOrElementOrDocument
 pub type nsINode_ErrorResult = ErrorResult;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsINode_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsINode_eCONTENT: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eCONTENT;
-pub const nsINode_eDOCUMENT: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eDOCUMENT;
-pub const nsINode_eATTRIBUTE: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eATTRIBUTE;
-pub const nsINode_eTEXT: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eTEXT;
-pub const nsINode_ePROCESSING_INSTRUCTION:
-          nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::ePROCESSING_INSTRUCTION;
-pub const nsINode_eCOMMENT: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eCOMMENT;
-pub const nsINode_eHTML_FORM_CONTROL: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eHTML_FORM_CONTROL;
-pub const nsINode_eDOCUMENT_FRAGMENT: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eDOCUMENT_FRAGMENT;
-pub const nsINode_eDATA_NODE: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eDATA_NODE;
-pub const nsINode_eMEDIA: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eMEDIA;
-pub const nsINode_eANIMATION: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eANIMATION;
-pub const nsINode_eFILTER: nsINode__bindgen_ty_bindgen_id_134000 =
-    nsINode__bindgen_ty_bindgen_id_134000::eFILTER;
+pub const nsINode_eCONTENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eCONTENT;
+pub const nsINode_eDOCUMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDOCUMENT;
+pub const nsINode_eATTRIBUTE: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eATTRIBUTE;
+pub const nsINode_eTEXT: nsINode__bindgen_ty_2 = nsINode__bindgen_ty_2::eTEXT;
+pub const nsINode_ePROCESSING_INSTRUCTION: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::ePROCESSING_INSTRUCTION;
+pub const nsINode_eCOMMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eCOMMENT;
+pub const nsINode_eHTML_FORM_CONTROL: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eHTML_FORM_CONTROL;
+pub const nsINode_eDOCUMENT_FRAGMENT: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDOCUMENT_FRAGMENT;
+pub const nsINode_eDATA_NODE: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eDATA_NODE;
+pub const nsINode_eMEDIA: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eMEDIA;
+pub const nsINode_eANIMATION: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eANIMATION;
+pub const nsINode_eFILTER: nsINode__bindgen_ty_2 =
+    nsINode__bindgen_ty_2::eFILTER;
 #[repr(u32)]
 /**
    * Bit-flags to pass (or'ed together) to IsNodeOfType()
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsINode__bindgen_ty_bindgen_id_134000 {
+pub enum nsINode__bindgen_ty_2 {
     eCONTENT = 1,
     eDOCUMENT = 2,
     eATTRIBUTE = 4,
     eTEXT = 8,
     ePROCESSING_INSTRUCTION = 16,
     eCOMMENT = 32,
     eHTML_FORM_CONTROL = 64,
     eDOCUMENT_FRAGMENT = 128,
     eDATA_NODE = 256,
     eMEDIA = 512,
     eANIMATION = 1024,
     eFILTER = 2048,
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_134769 {
+pub struct nsINode_nsSlots__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsINode_nsSlots {
-    pub vtable_: *const bindgen_vtable__bindgen_id_134769,
+    pub vtable_: *const nsINode_nsSlots__bindgen_vtable,
     /**
      * A list of mutation observers
      */
     pub mMutationObservers: [u64; 2usize],
     /**
      * An object implementing nsIDOMNodeList for this content (childNodes)
      * @see nsIDOMNodeList
      * @see nsGenericHTMLElement::GetChildNodes
@@ -3773,29 +3754,27 @@ pub enum nsINode_BooleanFlag {
     NodeHasRelevantHoverRules = 28,
     ElementHasWeirdParserInsertionMode = 29,
     ParserHasNotified = 30,
     MayBeApzAware = 31,
     BooleanFlagCount = 32,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsINode__bindgen_ty_bindgen_id_137918 {
+pub struct nsINode__bindgen_ty_1 {
     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_137918() {
-    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_bindgen_id_137918>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_bindgen_id_137918>()
-               , 8usize);
-}
-impl Clone for nsINode__bindgen_ty_bindgen_id_137918 {
+fn bindgen_test_layout_nsINode__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsINode__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsINode__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsINode__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsINode() {
     assert_eq!(::std::mem::size_of::<nsINode>() , 104usize);
     assert_eq!(::std::mem::align_of::<nsINode>() , 8usize);
 }
 #[repr(C)]
@@ -4140,83 +4119,74 @@ pub struct nsIDOMNode {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIDOMNode_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIDOMNode_ELEMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::ELEMENT_NODE;
-pub const nsIDOMNode_ATTRIBUTE_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363
-          =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::ATTRIBUTE_NODE;
-pub const nsIDOMNode_TEXT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::TEXT_NODE;
-pub const nsIDOMNode_CDATA_SECTION_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::CDATA_SECTION_NODE;
-pub const nsIDOMNode_ENTITY_REFERENCE_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::ENTITY_REFERENCE_NODE;
-pub const nsIDOMNode_ENTITY_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::ENTITY_NODE;
-pub const nsIDOMNode_PROCESSING_INSTRUCTION_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::PROCESSING_INSTRUCTION_NODE;
-pub const nsIDOMNode_COMMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::COMMENT_NODE;
-pub const nsIDOMNode_DOCUMENT_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::DOCUMENT_NODE;
-pub const nsIDOMNode_DOCUMENT_TYPE_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::DOCUMENT_TYPE_NODE;
-pub const nsIDOMNode_DOCUMENT_FRAGMENT_NODE:
-          nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::DOCUMENT_FRAGMENT_NODE;
-pub const nsIDOMNode_NOTATION_NODE: nsIDOMNode__bindgen_ty_bindgen_id_146363 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146363::NOTATION_NODE;
+pub const nsIDOMNode_ELEMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ELEMENT_NODE;
+pub const nsIDOMNode_ATTRIBUTE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ATTRIBUTE_NODE;
+pub const nsIDOMNode_TEXT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::TEXT_NODE;
+pub const nsIDOMNode_CDATA_SECTION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::CDATA_SECTION_NODE;
+pub const nsIDOMNode_ENTITY_REFERENCE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ENTITY_REFERENCE_NODE;
+pub const nsIDOMNode_ENTITY_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::ENTITY_NODE;
+pub const nsIDOMNode_PROCESSING_INSTRUCTION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::PROCESSING_INSTRUCTION_NODE;
+pub const nsIDOMNode_COMMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::COMMENT_NODE;
+pub const nsIDOMNode_DOCUMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_NODE;
+pub const nsIDOMNode_DOCUMENT_TYPE_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_TYPE_NODE;
+pub const nsIDOMNode_DOCUMENT_FRAGMENT_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::DOCUMENT_FRAGMENT_NODE;
+pub const nsIDOMNode_NOTATION_NODE: nsIDOMNode__bindgen_ty_1 =
+    nsIDOMNode__bindgen_ty_1::NOTATION_NODE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_146363 {
+pub enum nsIDOMNode__bindgen_ty_1 {
     ELEMENT_NODE = 1,
     ATTRIBUTE_NODE = 2,
     TEXT_NODE = 3,
     CDATA_SECTION_NODE = 4,
     ENTITY_REFERENCE_NODE = 5,
     ENTITY_NODE = 6,
     PROCESSING_INSTRUCTION_NODE = 7,
     COMMENT_NODE = 8,
     DOCUMENT_NODE = 9,
     DOCUMENT_TYPE_NODE = 10,
     DOCUMENT_FRAGMENT_NODE = 11,
     NOTATION_NODE = 12,
 }
-pub const nsIDOMNode_DOCUMENT_POSITION_DISCONNECTED:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_DISCONNECTED;
-pub const nsIDOMNode_DOCUMENT_POSITION_PRECEDING:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_PRECEDING;
-pub const nsIDOMNode_DOCUMENT_POSITION_FOLLOWING:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_FOLLOWING;
-pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINS:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_CONTAINS;
-pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINED_BY:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_CONTAINED_BY;
+pub const nsIDOMNode_DOCUMENT_POSITION_DISCONNECTED: nsIDOMNode__bindgen_ty_2
+          =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_DISCONNECTED;
+pub const nsIDOMNode_DOCUMENT_POSITION_PRECEDING: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_PRECEDING;
+pub const nsIDOMNode_DOCUMENT_POSITION_FOLLOWING: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_FOLLOWING;
+pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINS: nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_CONTAINS;
+pub const nsIDOMNode_DOCUMENT_POSITION_CONTAINED_BY: nsIDOMNode__bindgen_ty_2
+          =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_CONTAINED_BY;
 pub const nsIDOMNode_DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC:
-          nsIDOMNode__bindgen_ty_bindgen_id_146582 =
-    nsIDOMNode__bindgen_ty_bindgen_id_146582::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
+          nsIDOMNode__bindgen_ty_2 =
+    nsIDOMNode__bindgen_ty_2::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIDOMNode__bindgen_ty_bindgen_id_146582 {
+pub enum nsIDOMNode__bindgen_ty_2 {
     DOCUMENT_POSITION_DISCONNECTED = 1,
     DOCUMENT_POSITION_PRECEDING = 2,
     DOCUMENT_POSITION_FOLLOWING = 4,
     DOCUMENT_POSITION_CONTAINS = 8,
     DOCUMENT_POSITION_CONTAINED_BY = 16,
     DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32,
 }
 #[test]
@@ -5006,16 +4976,30 @@ impl nsPresContext {
         }
     }
     #[inline]
     pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) {
         self._bitfield_1 &= !(35184372088832usize as u64);
         self._bitfield_1 |=
             ((val as u32 as u64) << 45u32) & (35184372088832usize as u64);
     }
+    #[inline]
+    pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint {
+        unsafe {
+            ::std::mem::transmute(((self._bitfield_1 &
+                                        (70368744177664usize as u64)) >>
+                                       46u32) as u32)
+        }
+    }
+    #[inline]
+    pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) {
+        self._bitfield_1 &= !(70368744177664usize as u64);
+        self._bitfield_1 |=
+            ((val as u32 as u64) << 46u32) & (70368744177664usize as u64);
+    }
 }
 /**
  * Smart pointer class that can hold a pointer to either a RestyleManager
  * or a ServoRestyleManager.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct RestyleManagerHandle {
@@ -5221,40 +5205,25 @@ fn bindgen_test_layout_PLDHashTable_Iter
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum PLDHashTable_SearchReason { ForSearchOrRemove = 0, ForAdd = 1, }
 extern "C" {
     #[link_name = "_ZN12PLDHashTable12kMaxCapacityE"]
     pub static PLDHashTable_kMaxCapacity: u32;
 }
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable12kMinCapacityE"]
-    pub static PLDHashTable_kMinCapacity: u32;
-}
+pub const PLDHashTable_kMinCapacity: u32 = 8;
 extern "C" {
     #[link_name = "_ZN12PLDHashTable17kMaxInitialLengthE"]
     pub static PLDHashTable_kMaxInitialLength: u32;
 }
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable21kDefaultInitialLengthE"]
-    pub static PLDHashTable_kDefaultInitialLength: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable9kHashBitsE"]
-    pub static PLDHashTable_kHashBits: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable12kGoldenRatioE"]
-    pub static PLDHashTable_kGoldenRatio: u32;
-}
-extern "C" {
-    #[link_name = "_ZN12PLDHashTable14kCollisionFlagE"]
-    pub static PLDHashTable_kCollisionFlag: PLDHashNumber;
-}
+pub const PLDHashTable_kDefaultInitialLength: u32 = 4;
+pub const PLDHashTable_kHashBits: u32 = 32;
+pub const PLDHashTable_kGoldenRatio: u32 = 2654435769;
+pub const PLDHashTable_kCollisionFlag: PLDHashNumber = 1;
 #[test]
 fn bindgen_test_layout_PLDHashTable() {
     assert_eq!(::std::mem::size_of::<PLDHashTable>() , 40usize);
     assert_eq!(::std::mem::align_of::<PLDHashTable>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct PLDHashTableOps {
@@ -5313,22 +5282,21 @@ pub type PLDHashInitEntry =
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsPtrHashKey<T> {
     pub _base: PLDHashEntryHdr,
     pub mKey: *mut T,
 }
 pub type nsPtrHashKey_KeyType<T> = *mut T;
 pub type nsPtrHashKey_KeyTypePointer<T> = *mut T;
-pub const nsPtrHashKey_ALLOW_MEMMOVE:
-          nsPtrHashKey__bindgen_ty_bindgen_id_151074 =
-    nsPtrHashKey__bindgen_ty_bindgen_id_151074::ALLOW_MEMMOVE;
+pub const nsPtrHashKey_ALLOW_MEMMOVE: nsPtrHashKey__bindgen_ty_1 =
+    nsPtrHashKey__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPtrHashKey__bindgen_ty_bindgen_id_151074 { ALLOW_MEMMOVE = 0, }
+pub enum nsPtrHashKey__bindgen_ty_1 { ALLOW_MEMMOVE = 0, }
 /**
  * A node of content in a document's content model. This interface
  * is supported by all content objects.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIContent {
     pub _base: nsINode,
@@ -5336,38 +5304,36 @@ pub struct nsIContent {
 pub type nsIContent_IMEState = IMEState;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIContent_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIContent_eAllChildren: nsIContent__bindgen_ty_bindgen_id_152420 =
-    nsIContent__bindgen_ty_bindgen_id_152420::eAllChildren;
-pub const nsIContent_eAllButXBL: nsIContent__bindgen_ty_bindgen_id_152420 =
-    nsIContent__bindgen_ty_bindgen_id_152420::eAllButXBL;
-pub const nsIContent_eSkipPlaceholderContent:
-          nsIContent__bindgen_ty_bindgen_id_152420 =
-    nsIContent__bindgen_ty_bindgen_id_152420::eSkipPlaceholderContent;
+pub const nsIContent_eAllChildren: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eAllChildren;
+pub const nsIContent_eAllButXBL: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eAllButXBL;
+pub const nsIContent_eSkipPlaceholderContent: nsIContent__bindgen_ty_1 =
+    nsIContent__bindgen_ty_1::eSkipPlaceholderContent;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_152420 {
+pub enum nsIContent__bindgen_ty_1 {
     eAllChildren = 0,
     eAllButXBL = 1,
     eSkipPlaceholderContent = 2,
 }
-pub const nsIContent_ATTR_MISSING: nsIContent__bindgen_ty_bindgen_id_152656 =
-    nsIContent__bindgen_ty_bindgen_id_152656::ATTR_MISSING;
-pub const nsIContent_ATTR_VALUE_NO_MATCH:
-          nsIContent__bindgen_ty_bindgen_id_152656 =
-    nsIContent__bindgen_ty_bindgen_id_152656::ATTR_VALUE_NO_MATCH;
+pub const nsIContent_ATTR_MISSING: nsIContent__bindgen_ty_2 =
+    nsIContent__bindgen_ty_2::ATTR_MISSING;
+pub const nsIContent_ATTR_VALUE_NO_MATCH: nsIContent__bindgen_ty_2 =
+    nsIContent__bindgen_ty_2::ATTR_VALUE_NO_MATCH;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIContent__bindgen_ty_bindgen_id_152656 {
+pub enum nsIContent__bindgen_ty_2 {
     ATTR_MISSING = -1,
     ATTR_VALUE_NO_MATCH = -2,
 }
 /**
    * Check whether this content node's given attribute has one of a given
    * list of values. If there is a match, we return the index in the list
    * of the first matching value. If there was no attribute at all, then
    * we return ATTR_MISSING. If there was an attribute but it didn't
@@ -5378,17 +5344,17 @@ pub enum nsIContent__bindgen_ty_bindgen_
    *                     be kNameSpaceID_Unknown.
    * @param aName The name atom of the attribute.  Must not be null.
    * @param aValues a nullptr-terminated array of pointers to atom values to test
    *                against.
    * @param aCaseSensitive Whether to do a case-sensitive compare on the values.
    * @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index
    * indicating the first value of aValues that matched
    */
-pub type nsIContent_AttrValuesArray = *const *mut nsIAtom;
+pub type nsIContent_AttrValuesArray = *const *const nsIAtom;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIContent_ETabFocusType {
     eTabFocus_textControlsMask = 1,
     eTabFocus_formElementsMask = 2,
     eTabFocus_linksMask = 4,
     eTabFocus_any = 7,
 }
@@ -5567,17 +5533,17 @@ pub struct FragmentOrElement_nsDOMSlots 
      * Holds any SMIL override style declaration for this element.
      */
     pub mSMILOverrideStyleDeclaration: RefPtr<DeclarationBlock>,
     /**
      * An object implementing nsIDOMMozNamedAttrMap for this content (attributes)
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
-    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755,
+    pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_1,
     /**
      * An object implementing the .children property for this element.
      */
     pub mChildrenList: RefPtr<nsContentList>,
     /**
      * An object implementing the .classList property for this element.
      */
     pub mClassList: RefPtr<nsDOMTokenList>,
@@ -5605,36 +5571,36 @@ pub struct FragmentOrElement_nsDOMSlots 
     /**
      * Web components custom element data.
      */
     pub mCustomElementData: RefPtr<CustomElementData>,
     pub mRegisteredIntersectionObservers: nsTArray<FragmentOrElement_nsDOMSlots_IntersectionObserverRegistration>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755 {
+pub struct FragmentOrElement_nsDOMSlots__bindgen_ty_1 {
     /**
       * The nearest enclosing content node with a binding that created us.
       * @see FragmentOrElement::GetBindingParent
       */
     pub mBindingParent: __BindgenUnionField<*mut nsIContent>,
     /**
       * The controllers of the XUL Element.
       */
     pub mControllers: __BindgenUnionField<*mut nsIControllers>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755() {
-    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755>()
+fn bindgen_test_layout_FragmentOrElement_nsDOMSlots__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_1>()
                , 8usize);
-    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755>()
+    assert_eq!(::std::mem::align_of::<FragmentOrElement_nsDOMSlots__bindgen_ty_1>()
                , 8usize);
 }
-impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_bindgen_id_153755 {
+impl Clone for FragmentOrElement_nsDOMSlots__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 /**
      * Registered Intersection Observers on the element.
      */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct FragmentOrElement_nsDOMSlots_IntersectionObserverRegistration {
@@ -5712,67 +5678,58 @@ pub struct nsIChannel {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIChannel_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIChannel_LOAD_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_DOCUMENT_URI;
-pub const nsIChannel_LOAD_RETARGETED_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_RETARGETED_DOCUMENT_URI;
-pub const nsIChannel_LOAD_REPLACE: nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_REPLACE;
-pub const nsIChannel_LOAD_INITIAL_DOCUMENT_URI:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_INITIAL_DOCUMENT_URI;
-pub const nsIChannel_LOAD_TARGETED: nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_TARGETED;
-pub const nsIChannel_LOAD_CALL_CONTENT_SNIFFERS:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_CALL_CONTENT_SNIFFERS;
-pub const nsIChannel_LOAD_CLASSIFY_URI:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_CLASSIFY_URI;
+pub const nsIChannel_LOAD_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_DOCUMENT_URI;
+pub const nsIChannel_LOAD_RETARGETED_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_RETARGETED_DOCUMENT_URI;
+pub const nsIChannel_LOAD_REPLACE: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_REPLACE;
+pub const nsIChannel_LOAD_INITIAL_DOCUMENT_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_INITIAL_DOCUMENT_URI;
+pub const nsIChannel_LOAD_TARGETED: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_TARGETED;
+pub const nsIChannel_LOAD_CALL_CONTENT_SNIFFERS: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_CALL_CONTENT_SNIFFERS;
+pub const nsIChannel_LOAD_CLASSIFY_URI: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_CLASSIFY_URI;
 pub const nsIChannel_LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE;
-pub const nsIChannel_LOAD_EXPLICIT_CREDENTIALS:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_EXPLICIT_CREDENTIALS;
-pub const nsIChannel_LOAD_BYPASS_SERVICE_WORKER:
-          nsIChannel__bindgen_ty_bindgen_id_166960 =
-    nsIChannel__bindgen_ty_bindgen_id_166960::LOAD_BYPASS_SERVICE_WORKER;
+          nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE;
+pub const nsIChannel_LOAD_EXPLICIT_CREDENTIALS: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_EXPLICIT_CREDENTIALS;
+pub const nsIChannel_LOAD_BYPASS_SERVICE_WORKER: nsIChannel__bindgen_ty_1 =
+    nsIChannel__bindgen_ty_1::LOAD_BYPASS_SERVICE_WORKER;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_166960 {
+pub enum nsIChannel__bindgen_ty_1 {
     LOAD_DOCUMENT_URI = 65536,
     LOAD_RETARGETED_DOCUMENT_URI = 131072,
     LOAD_REPLACE = 262144,
     LOAD_INITIAL_DOCUMENT_URI = 524288,
     LOAD_TARGETED = 1048576,
     LOAD_CALL_CONTENT_SNIFFERS = 2097152,
     LOAD_CLASSIFY_URI = 4194304,
     LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE = 8388608,
     LOAD_EXPLICIT_CREDENTIALS = 16777216,
     LOAD_BYPASS_SERVICE_WORKER = 33554432,
 }
-pub const nsIChannel_DISPOSITION_INLINE:
-          nsIChannel__bindgen_ty_bindgen_id_166980 =
-    nsIChannel__bindgen_ty_bindgen_id_166980::DISPOSITION_INLINE;
-pub const nsIChannel_DISPOSITION_ATTACHMENT:
-          nsIChannel__bindgen_ty_bindgen_id_166980 =
-    nsIChannel__bindgen_ty_bindgen_id_166980::DISPOSITION_ATTACHMENT;
+pub const nsIChannel_DISPOSITION_INLINE: nsIChannel__bindgen_ty_2 =
+    nsIChannel__bindgen_ty_2::DISPOSITION_INLINE;
+pub const nsIChannel_DISPOSITION_ATTACHMENT: nsIChannel__bindgen_ty_2 =
+    nsIChannel__bindgen_ty_2::DISPOSITION_ATTACHMENT;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIChannel__bindgen_ty_bindgen_id_166980 {
+pub enum nsIChannel__bindgen_ty_2 {
     DISPOSITION_INLINE = 0,
     DISPOSITION_ATTACHMENT = 1,
 }
 #[test]
 fn bindgen_test_layout_nsIChannel() {
     assert_eq!(::std::mem::size_of::<nsIChannel>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsIChannel>() , 8usize);
 }
@@ -5786,57 +5743,45 @@ pub struct nsIRequest {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsIRequest_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsIRequest_LOAD_REQUESTMASK:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_REQUESTMASK;
-pub const nsIRequest_LOAD_NORMAL: nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_NORMAL;
-pub const nsIRequest_LOAD_BACKGROUND: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_BACKGROUND;
-pub const nsIRequest_INHIBIT_PIPELINE:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::INHIBIT_PIPELINE;
-pub const nsIRequest_INHIBIT_CACHING: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::INHIBIT_CACHING;
-pub const nsIRequest_INHIBIT_PERSISTENT_CACHING:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::INHIBIT_PERSISTENT_CACHING;
-pub const nsIRequest_LOAD_BYPASS_CACHE:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_BYPASS_CACHE;
-pub const nsIRequest_LOAD_FROM_CACHE: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_FROM_CACHE;
-pub const nsIRequest_VALIDATE_ALWAYS: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::VALIDATE_ALWAYS;
-pub const nsIRequest_VALIDATE_NEVER: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::VALIDATE_NEVER;
-pub const nsIRequest_VALIDATE_ONCE_PER_SESSION:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::VALIDATE_ONCE_PER_SESSION;
-pub const nsIRequest_LOAD_ANONYMOUS: nsIRequest__bindgen_ty_bindgen_id_166798
-          =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_ANONYMOUS;
-pub const nsIRequest_LOAD_FRESH_CONNECTION:
-          nsIRequest__bindgen_ty_bindgen_id_166798 =
-    nsIRequest__bindgen_ty_bindgen_id_166798::LOAD_FRESH_CONNECTION;
+pub const nsIRequest_LOAD_REQUESTMASK: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_REQUESTMASK;
+pub const nsIRequest_LOAD_NORMAL: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_NORMAL;
+pub const nsIRequest_LOAD_BACKGROUND: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_BACKGROUND;
+pub const nsIRequest_INHIBIT_PIPELINE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_PIPELINE;
+pub const nsIRequest_INHIBIT_CACHING: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_CACHING;
+pub const nsIRequest_INHIBIT_PERSISTENT_CACHING: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::INHIBIT_PERSISTENT_CACHING;
+pub const nsIRequest_LOAD_BYPASS_CACHE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_BYPASS_CACHE;
+pub const nsIRequest_LOAD_FROM_CACHE: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_FROM_CACHE;
+pub const nsIRequest_VALIDATE_ALWAYS: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_ALWAYS;
+pub const nsIRequest_VALIDATE_NEVER: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_NEVER;
+pub const nsIRequest_VALIDATE_ONCE_PER_SESSION: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::VALIDATE_ONCE_PER_SESSION;
+pub const nsIRequest_LOAD_ANONYMOUS: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_ANONYMOUS;
+pub const nsIRequest_LOAD_FRESH_CONNECTION: nsIRequest__bindgen_ty_1 =
+    nsIRequest__bindgen_ty_1::LOAD_FRESH_CONNECTION;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIRequest__bindgen_ty_bindgen_id_166798 {
+pub enum nsIRequest__bindgen_ty_1 {
     LOAD_REQUESTMASK = 65535,
     LOAD_NORMAL = 0,
     LOAD_BACKGROUND = 1,
     INHIBIT_PIPELINE = 64,
     INHIBIT_CACHING = 128,
     INHIBIT_PERSISTENT_CACHING = 256,
     LOAD_BYPASS_CACHE = 512,
     LOAD_FROM_CACHE = 1024,
@@ -6366,35 +6311,31 @@ pub enum nsIPresShell_IntrinsicDirty {
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIPresShell_ReflowRootHandling {
     ePositionOrSizeChange = 0,
     eNoPositionOrSizeChange = 1,
     eInferFromBitToAdd = 2,
 }
-pub const nsIPresShell_SCROLL_TOP: nsIPresShell__bindgen_ty_bindgen_id_185533
-          =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_TOP;
-pub const nsIPresShell_SCROLL_BOTTOM:
-          nsIPresShell__bindgen_ty_bindgen_id_185533 =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_BOTTOM;
-pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_bindgen_id_185533 =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_TOP;
-pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_bindgen_id_185533 =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_BOTTOM;
-pub const nsIPresShell_SCROLL_CENTER:
-          nsIPresShell__bindgen_ty_bindgen_id_185533 =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_CENTER;
-pub const nsIPresShell_SCROLL_MINIMUM:
-          nsIPresShell__bindgen_ty_bindgen_id_185533 =
-    nsIPresShell__bindgen_ty_bindgen_id_185533::SCROLL_MINIMUM;
+pub const nsIPresShell_SCROLL_TOP: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_TOP;
+pub const nsIPresShell_SCROLL_BOTTOM: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_BOTTOM;
+pub const SCROLL_LEFT: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_TOP;
+pub const SCROLL_RIGHT: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_BOTTOM;
+pub const nsIPresShell_SCROLL_CENTER: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_CENTER;
+pub const nsIPresShell_SCROLL_MINIMUM: nsIPresShell__bindgen_ty_1 =
+    nsIPresShell__bindgen_ty_1::SCROLL_MINIMUM;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_185533 {
+pub enum nsIPresShell__bindgen_ty_1 {
     SCROLL_TOP = 0,
     SCROLL_BOTTOM = 100,
     SCROLL_CENTER = 50,
     SCROLL_MINIMUM = -1,
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsIPresShell_WhenToScroll {
@@ -6410,61 +6351,53 @@ pub struct nsIPresShell_ScrollAxis {
 #[test]
 fn bindgen_test_layout_nsIPresShell_ScrollAxis() {
     assert_eq!(::std::mem::size_of::<nsIPresShell_ScrollAxis>() , 4usize);
     assert_eq!(::std::mem::align_of::<nsIPresShell_ScrollAxis>() , 4usize);
 }
 impl Clone for nsIPresShell_ScrollAxis {
     fn clone(&self) -> Self { *self }
 }
-pub const nsIPresShell_SCROLL_FIRST_ANCESTOR_ONLY:
-          nsIPresShell__bindgen_ty_bindgen_id_185564 =
-    nsIPresShell__bindgen_ty_bindgen_id_185564::SCROLL_FIRST_ANCESTOR_ONLY;
-pub const nsIPresShell_SCROLL_OVERFLOW_HIDDEN:
-          nsIPresShell__bindgen_ty_bindgen_id_185564 =
-    nsIPresShell__bindgen_ty_bindgen_id_185564::SCROLL_OVERFLOW_HIDDEN;
-pub const nsIPresShell_SCROLL_NO_PARENT_FRAMES:
-          nsIPresShell__bindgen_ty_bindgen_id_185564 =
-    nsIPresShell__bindgen_ty_bindgen_id_185564::SCROLL_NO_PARENT_FRAMES;
-pub const nsIPresShell_SCROLL_SMOOTH:
-          nsIPresShell__bindgen_ty_bindgen_id_185564 =
-    nsIPresShell__bindgen_ty_bindgen_id_185564::SCROLL_SMOOTH;
-pub const nsIPresShell_SCROLL_SMOOTH_AUTO:
-          nsIPresShell__bindgen_ty_bindgen_id_185564 =
-    nsIPresShell__bindgen_ty_bindgen_id_185564::SCROLL_SMOOTH_AUTO;
+pub const nsIPresShell_SCROLL_FIRST_ANCESTOR_ONLY: nsIPresShell__bindgen_ty_2
+          =
+    nsIPresShell__bindgen_ty_2::SCROLL_FIRST_ANCESTOR_ONLY;
+pub const nsIPresShell_SCROLL_OVERFLOW_HIDDEN: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_OVERFLOW_HIDDEN;
+pub const nsIPresShell_SCROLL_NO_PARENT_FRAMES: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_NO_PARENT_FRAMES;
+pub const nsIPresShell_SCROLL_SMOOTH: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_SMOOTH;
+pub const nsIPresShell_SCROLL_SMOOTH_AUTO: nsIPresShell__bindgen_ty_2 =
+    nsIPresShell__bindgen_ty_2::SCROLL_SMOOTH_AUTO;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_185564 {
+pub enum nsIPresShell__bindgen_ty_2 {
     SCROLL_FIRST_ANCESTOR_ONLY = 1,
     SCROLL_OVERFLOW_HIDDEN = 2,
     SCROLL_NO_PARENT_FRAMES = 4,
     SCROLL_SMOOTH = 8,
     SCROLL_SMOOTH_AUTO = 16,
 }
-pub const nsIPresShell_RENDER_IS_UNTRUSTED:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_IS_UNTRUSTED;
+pub const nsIPresShell_RENDER_IS_UNTRUSTED: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_IS_UNTRUSTED;
 pub const nsIPresShell_RENDER_IGNORE_VIEWPORT_SCROLLING:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_IGNORE_VIEWPORT_SCROLLING;
-pub const nsIPresShell_RENDER_CARET:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_CARET;
-pub const nsIPresShell_RENDER_USE_WIDGET_LAYERS:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_USE_WIDGET_LAYERS;
-pub const nsIPresShell_RENDER_ASYNC_DECODE_IMAGES:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_ASYNC_DECODE_IMAGES;
-pub const nsIPresShell_RENDER_DOCUMENT_RELATIVE:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_DOCUMENT_RELATIVE;
+          nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_IGNORE_VIEWPORT_SCROLLING;
+pub const nsIPresShell_RENDER_CARET: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_CARET;
+pub const nsIPresShell_RENDER_USE_WIDGET_LAYERS: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_USE_WIDGET_LAYERS;
+pub const nsIPresShell_RENDER_ASYNC_DECODE_IMAGES: nsIPresShell__bindgen_ty_3
+          =
+    nsIPresShell__bindgen_ty_3::RENDER_ASYNC_DECODE_IMAGES;
+pub const nsIPresShell_RENDER_DOCUMENT_RELATIVE: nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_DOCUMENT_RELATIVE;
 pub const nsIPresShell_RENDER_DRAWWINDOW_NOT_FLUSHING:
-          nsIPresShell__bindgen_ty_bindgen_id_185988 =
-    nsIPresShell__bindgen_ty_bindgen_id_185988::RENDER_DRAWWINDOW_NOT_FLUSHING;
+          nsIPresShell__bindgen_ty_3 =
+    nsIPresShell__bindgen_ty_3::RENDER_DRAWWINDOW_NOT_FLUSHING;
 #[repr(u32)]
 /**
    * Render the document into an arbitrary gfxContext
    * Designed for getting a picture of a document or a piece of a document
    * Note that callers will generally want to call FlushPendingNotifications
    * to get an up-to-date view of the document
    * @param aRect is the region to capture into the offscreen buffer, in the
    * root frame's coordinate system (if aIgnoreViewportScrolling is false)
@@ -6495,50 +6428,47 @@ pub const nsIPresShell_RENDER_DRAWWINDOW
    * or the document is in ignore viewport scrolling mode
    * (nsIPresShell::SetIgnoreViewportScrolling/IgnoringViewportScrolling).
    * @param aBackgroundColor a background color to render onto
    * @param aRenderedContext the gfxContext to render to. We render so that
    * one CSS pixel in the source document is rendered to one unit in the current
    * transform.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_185988 {
+pub enum nsIPresShell__bindgen_ty_3 {
     RENDER_IS_UNTRUSTED = 1,
     RENDER_IGNORE_VIEWPORT_SCROLLING = 2,
     RENDER_CARET = 4,
     RENDER_USE_WIDGET_LAYERS = 8,
     RENDER_ASYNC_DECODE_IMAGES = 16,
     RENDER_DOCUMENT_RELATIVE = 32,
     RENDER_DRAWWINDOW_NOT_FLUSHING = 64,
 }
-pub const nsIPresShell_RENDER_IS_IMAGE:
-          nsIPresShell__bindgen_ty_bindgen_id_186006 =
-    nsIPresShell__bindgen_ty_bindgen_id_186006::RENDER_IS_IMAGE;
-pub const nsIPresShell_RENDER_AUTO_SCALE:
-          nsIPresShell__bindgen_ty_bindgen_id_186006 =
-    nsIPresShell__bindgen_ty_bindgen_id_186006::RENDER_AUTO_SCALE;
+pub const nsIPresShell_RENDER_IS_IMAGE: nsIPresShell__bindgen_ty_4 =
+    nsIPresShell__bindgen_ty_4::RENDER_IS_IMAGE;
+pub const nsIPresShell_RENDER_AUTO_SCALE: nsIPresShell__bindgen_ty_4 =
+    nsIPresShell__bindgen_ty_4::RENDER_AUTO_SCALE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_186006 {
+pub enum nsIPresShell__bindgen_ty_4 {
     RENDER_IS_IMAGE = 256,
     RENDER_AUTO_SCALE = 128,
 }
-pub const nsIPresShell_FORCE_DRAW: nsIPresShell__bindgen_ty_bindgen_id_186137
-          =
-    nsIPresShell__bindgen_ty_bindgen_id_186137::FORCE_DRAW;
+pub const nsIPresShell_FORCE_DRAW: nsIPresShell__bindgen_ty_5 =
+    nsIPresShell__bindgen_ty_5::FORCE_DRAW;
 #[repr(u32)]
 /**
    * Add a solid color item to the bottom of aList with frame aFrame and bounds
    * aBounds. Checks first if this needs to be done by checking if aFrame is a
    * canvas frame (if the FORCE_DRAW flag is passed then this check is skipped).
    * aBackstopColor is composed behind the background color of the canvas, it is
    * transparent by default.
    */
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsIPresShell__bindgen_ty_bindgen_id_186137 { FORCE_DRAW = 1, }
+pub enum nsIPresShell__bindgen_ty_5 { FORCE_DRAW = 1, }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsIPresShell_PointerCaptureInfo {
     pub mPendingContent: nsCOMPtr<nsIContent>,
     pub mOverrideContent: nsCOMPtr<nsIContent>,
 }
 #[test]
 fn bindgen_test_layout_nsIPresShell_PointerCaptureInfo() {
@@ -6898,77 +6828,73 @@ impl Clone for TextOrElementOrDocument {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct DOMPointInit {
     pub _address: u8,
 }
 impl Clone for DOMPointInit {
     fn clone(&self) -> Self { *self }
 }
-pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_LISTENERMANAGER;
-pub const NODE_HAS_PROPERTIES: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_PROPERTIES;
-pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_ANONYMOUS_ROOT;
-pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
-pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_NATIVE_ANONYMOUS_ROOT;
-pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_FORCE_XBL_BINDINGS;
-pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_MAY_BE_IN_BINDING_MNGR;
-pub const NODE_IS_EDITABLE: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_EDITABLE;
-pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_MAY_HAVE_CLASS;
-pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_IN_SHADOW_TREE;
-pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_EMPTY_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_SLOW_SELECTOR;
-pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_EDGE_CHILD_SELECTOR;
-pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_bindgen_id_187523
-          =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
-pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_ALL_SELECTOR_FLAGS;
-pub const NODE_NEEDS_FRAME: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_NEEDS_FRAME;
-pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_DESCENDANTS_NEED_FRAMES;
-pub const NODE_HAS_ACCESSKEY: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_ACCESSKEY;
-pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_DIRECTION_RTL;
-pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_HAS_DIRECTION_LTR;
-pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_ALL_DIRECTION_FLAGS;
-pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_CHROME_ONLY_ACCESS;
-pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
-pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_SHARED_RESTYLE_BIT_1;
-pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_bindgen_id_187523
-          =
-    _bindgen_ty_bindgen_id_187523::NODE_SHARED_RESTYLE_BIT_2;
-pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_bindgen_id_187523 =
-    _bindgen_ty_bindgen_id_187523::NODE_TYPE_SPECIFIC_BITS_OFFSET;
+pub const NODE_HAS_LISTENERMANAGER: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_LISTENERMANAGER;
+pub const NODE_HAS_PROPERTIES: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_PROPERTIES;
+pub const NODE_IS_ANONYMOUS_ROOT: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_IS_ANONYMOUS_ROOT;
+pub const NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE;
+pub const NODE_IS_NATIVE_ANONYMOUS_ROOT: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_IS_NATIVE_ANONYMOUS_ROOT;
+pub const NODE_FORCE_XBL_BINDINGS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_FORCE_XBL_BINDINGS;
+pub const NODE_MAY_BE_IN_BINDING_MNGR: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_MAY_BE_IN_BINDING_MNGR;
+pub const NODE_IS_EDITABLE: _bindgen_ty_62 = _bindgen_ty_62::NODE_IS_EDITABLE;
+pub const NODE_MAY_HAVE_CLASS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_MAY_HAVE_CLASS;
+pub const NODE_IS_IN_SHADOW_TREE: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_IS_IN_SHADOW_TREE;
+pub const NODE_HAS_EMPTY_SELECTOR: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_EMPTY_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_SLOW_SELECTOR;
+pub const NODE_HAS_EDGE_CHILD_SELECTOR: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_EDGE_CHILD_SELECTOR;
+pub const NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS;
+pub const NODE_ALL_SELECTOR_FLAGS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_ALL_SELECTOR_FLAGS;
+pub const NODE_NEEDS_FRAME: _bindgen_ty_62 = _bindgen_ty_62::NODE_NEEDS_FRAME;
+pub const NODE_DESCENDANTS_NEED_FRAMES: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_DESCENDANTS_NEED_FRAMES;
+pub const NODE_HAS_ACCESSKEY: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_ACCESSKEY;
+pub const NODE_HAS_DIRECTION_RTL: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_DIRECTION_RTL;
+pub const NODE_HAS_DIRECTION_LTR: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_HAS_DIRECTION_LTR;
+pub const NODE_ALL_DIRECTION_FLAGS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_ALL_DIRECTION_FLAGS;
+pub const NODE_CHROME_ONLY_ACCESS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_CHROME_ONLY_ACCESS;
+pub const NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_IS_ROOT_OF_CHROME_ONLY_ACCESS;
+pub const NODE_SHARED_RESTYLE_BIT_1: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_SHARED_RESTYLE_BIT_2: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_IS_DIRTY_FOR_SERVO: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_SHARED_RESTYLE_BIT_1;
+pub const NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_SHARED_RESTYLE_BIT_2;
+pub const NODE_TYPE_SPECIFIC_BITS_OFFSET: _bindgen_ty_62 =
+    _bindgen_ty_62::NODE_TYPE_SPECIFIC_BITS_OFFSET;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum _bindgen_ty_bindgen_id_187523 {
+pub enum _bindgen_ty_62 {
     NODE_HAS_LISTENERMANAGER = 4,
     NODE_HAS_PROPERTIES = 8,
     NODE_IS_ANONYMOUS_ROOT = 16,
     NODE_IS_IN_NATIVE_ANONYMOUS_SUBTREE = 32,
     NODE_IS_NATIVE_ANONYMOUS_ROOT = 64,
     NODE_FORCE_XBL_BINDINGS = 128,
     NODE_MAY_BE_IN_BINDING_MNGR = 256,
     NODE_IS_EDITABLE = 512,
@@ -7014,30 +6940,27 @@ pub struct nsITimer {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsITimer_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const nsITimer_TYPE_ONE_SHOT: nsITimer__bindgen_ty_bindgen_id_200039 =
-    nsITimer__bindgen_ty_bindgen_id_200039::TYPE_ONE_SHOT;
-pub const nsITimer_TYPE_REPEATING_SLACK:
-          nsITimer__bindgen_ty_bindgen_id_200039 =
-    nsITimer__bindgen_ty_bindgen_id_200039::TYPE_REPEATING_SLACK;
-pub const nsITimer_TYPE_REPEATING_PRECISE:
-          nsITimer__bindgen_ty_bindgen_id_200039 =
-    nsITimer__bindgen_ty_bindgen_id_200039::TYPE_REPEATING_PRECISE;
-pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP:
-          nsITimer__bindgen_ty_bindgen_id_200039 =
-    nsITimer__bindgen_ty_bindgen_id_200039::TYPE_REPEATING_PRECISE_CAN_SKIP;
+pub const nsITimer_TYPE_ONE_SHOT: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_ONE_SHOT;
+pub const nsITimer_TYPE_REPEATING_SLACK: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_SLACK;
+pub const nsITimer_TYPE_REPEATING_PRECISE: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_PRECISE;
+pub const nsITimer_TYPE_REPEATING_PRECISE_CAN_SKIP: nsITimer__bindgen_ty_1 =
+    nsITimer__bindgen_ty_1::TYPE_REPEATING_PRECISE_CAN_SKIP;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsITimer__bindgen_ty_bindgen_id_200039 {
+pub enum nsITimer__bindgen_ty_1 {
     TYPE_ONE_SHOT = 0,
     TYPE_REPEATING_SLACK = 1,
     TYPE_REPEATING_PRECISE = 2,
     TYPE_REPEATING_PRECISE_CAN_SKIP = 3,
 }
 #[test]
 fn bindgen_test_layout_nsITimer() {
     assert_eq!(::std::mem::size_of::<nsITimer>() , 8usize);
@@ -7051,25 +6974,24 @@ impl Clone for nsITimer {
  * is 32 bits so that objects that includes this as a field can pad and align
  * efficiently.
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsExpirationState {
     pub _bitfield_1: u32,
 }
-pub const nsExpirationState_NOT_TRACKED:
-          nsExpirationState__bindgen_ty_bindgen_id_200515 =
-    nsExpirationState__bindgen_ty_bindgen_id_200515::NOT_TRACKED;
+pub const nsExpirationState_NOT_TRACKED: nsExpirationState__bindgen_ty_1 =
+    nsExpirationState__bindgen_ty_1::NOT_TRACKED;
 pub const nsExpirationState_MAX_INDEX_IN_GENERATION:
-          nsExpirationState__bindgen_ty_bindgen_id_200515 =
-    nsExpirationState__bindgen_ty_bindgen_id_200515::MAX_INDEX_IN_GENERATION;
+          nsExpirationState__bindgen_ty_1 =
+    nsExpirationState__bindgen_ty_1::MAX_INDEX_IN_GENERATION;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsExpirationState__bindgen_ty_bindgen_id_200515 {
+pub enum nsExpirationState__bindgen_ty_1 {
     NOT_TRACKED = 15,
     MAX_INDEX_IN_GENERATION = 268435455,
 }
 #[test]
 fn bindgen_test_layout_nsExpirationState() {
     assert_eq!(::std::mem::size_of::<nsExpirationState>() , 4usize);
     assert_eq!(::std::mem::align_of::<nsExpirationState>() , 4usize);
 }
@@ -7131,62 +7053,53 @@ pub struct imgIRequest {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imgIRequest_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
-pub const imgIRequest_STATUS_NONE: imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_NONE;
-pub const imgIRequest_STATUS_SIZE_AVAILABLE:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_SIZE_AVAILABLE;
-pub const imgIRequest_STATUS_LOAD_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_LOAD_COMPLETE;
-pub const imgIRequest_STATUS_ERROR: imgIRequest__bindgen_ty_bindgen_id_201934
-          =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_ERROR;
-pub const imgIRequest_STATUS_FRAME_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_FRAME_COMPLETE;
-pub const imgIRequest_STATUS_DECODE_COMPLETE:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_DECODE_COMPLETE;
-pub const imgIRequest_STATUS_IS_ANIMATED:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_IS_ANIMATED;
-pub const imgIRequest_STATUS_HAS_TRANSPARENCY:
-          imgIRequest__bindgen_ty_bindgen_id_201934 =
-    imgIRequest__bindgen_ty_bindgen_id_201934::STATUS_HAS_TRANSPARENCY;
+pub const imgIRequest_STATUS_NONE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_NONE;
+pub const imgIRequest_STATUS_SIZE_AVAILABLE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_SIZE_AVAILABLE;
+pub const imgIRequest_STATUS_LOAD_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_LOAD_COMPLETE;
+pub const imgIRequest_STATUS_ERROR: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_ERROR;
+pub const imgIRequest_STATUS_FRAME_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_FRAME_COMPLETE;
+pub const imgIRequest_STATUS_DECODE_COMPLETE: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_DECODE_COMPLETE;
+pub const imgIRequest_STATUS_IS_ANIMATED: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_IS_ANIMATED;
+pub const imgIRequest_STATUS_HAS_TRANSPARENCY: imgIRequest__bindgen_ty_1 =
+    imgIRequest__bindgen_ty_1::STATUS_HAS_TRANSPARENCY;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_201934 {
+pub enum imgIRequest__bindgen_ty_1 {
     STATUS_NONE = 0,
     STATUS_SIZE_AVAILABLE = 1,
     STATUS_LOAD_COMPLETE = 2,
     STATUS_ERROR = 4,
     STATUS_FRAME_COMPLETE = 8,
     STATUS_DECODE_COMPLETE = 16,
     STATUS_IS_ANIMATED = 32,
     STATUS_HAS_TRANSPARENCY = 64,
 }
-pub const imgIRequest_CORS_NONE: imgIRequest__bindgen_ty_bindgen_id_202014 =
-    imgIRequest__bindgen_ty_bindgen_id_202014::CORS_NONE;
-pub const imgIRequest_CORS_ANONYMOUS:
-          imgIRequest__bindgen_ty_bindgen_id_202014 =
-    imgIRequest__bindgen_ty_bindgen_id_202014::CORS_ANONYMOUS;
-pub const imgIRequest_CORS_USE_CREDENTIALS:
-          imgIRequest__bindgen_ty_bindgen_id_202014 =
-    imgIRequest__bindgen_ty_bindgen_id_202014::CORS_USE_CREDENTIALS;
+pub const imgIRequest_CORS_NONE: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_NONE;
+pub const imgIRequest_CORS_ANONYMOUS: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_ANONYMOUS;
+pub const imgIRequest_CORS_USE_CREDENTIALS: imgIRequest__bindgen_ty_2 =
+    imgIRequest__bindgen_ty_2::CORS_USE_CREDENTIALS;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgIRequest__bindgen_ty_bindgen_id_202014 {
+pub enum imgIRequest__bindgen_ty_2 {
     CORS_NONE = 1,
     CORS_ANONYMOUS = 2,
     CORS_USE_CREDENTIALS = 3,
 }
 #[test]
 fn bindgen_test_layout_imgIRequest() {
     assert_eq!(::std::mem::size_of::<imgIRequest>() , 8usize);
     assert_eq!(::std::mem::align_of::<imgIRequest>() , 8usize);
@@ -7494,22 +7407,22 @@ pub struct URLValue {
     pub _base: URLValueData,
 }
 #[test]
 fn bindgen_test_layout_URLValue() {
     assert_eq!(::std::mem::size_of::<URLValue>() , 64usize);
     assert_eq!(::std::mem::align_of::<URLValue>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_220625 {
+pub struct URLValueData__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct URLValueData {
-    pub vtable_: *const bindgen_vtable__bindgen_id_220625,
+    pub vtable_: *const URLValueData__bindgen_vtable,
     pub mRefCnt: ThreadSafeAutoRefCnt,
     pub mURI: nsMainThreadPtrHandle<nsIURI>,
     pub mBaseURI: nsMainThreadPtrHandle<nsIURI>,
     pub mString: RefPtr<nsStringBuffer>,
     pub mReferrer: nsMainThreadPtrHandle<nsIURI>,
     pub mOriginPrincipal: nsMainThreadPtrHandle<nsIPrincipal>,
     pub mURIResolved: bool,
     pub mIsLocalRef: bool,
@@ -7709,23 +7622,21 @@ pub struct nsPresArena_FreeList {
     pub mEntries: nsTArray<*mut ::std::os::raw::c_void>,
     pub mEntrySize: usize,
     pub mEntriesEverAllocated: usize,
     pub mKey: nsPresArena_FreeList_KeyTypePointer,
 }
 pub type nsPresArena_FreeList_KeyType = u32;
 pub type nsPresArena_FreeList_KeyTypePointer = *const ::std::os::raw::c_void;
 pub const nsPresArena_FreeList_ALLOW_MEMMOVE:
-          nsPresArena_FreeList__bindgen_ty_bindgen_id_222790 =
-    nsPresArena_FreeList__bindgen_ty_bindgen_id_222790::ALLOW_MEMMOVE;
+          nsPresArena_FreeList__bindgen_ty_1 =
+    nsPresArena_FreeList__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsPresArena_FreeList__bindgen_ty_bindgen_id_222790 {
-    ALLOW_MEMMOVE = 0,
-}
+pub enum nsPresArena_FreeList__bindgen_ty_1 { ALLOW_MEMMOVE = 0, }
 #[test]
 fn bindgen_test_layout_nsPresArena_FreeList() {
     assert_eq!(::std::mem::size_of::<nsPresArena_FreeList>() , 40usize);
     assert_eq!(::std::mem::align_of::<nsPresArena_FreeList>() , 8usize);
 }
 #[test]
 fn bindgen_test_layout_nsPresArena() {
     assert_eq!(::std::mem::size_of::<nsPresArena>() , 136usize);
@@ -7739,45 +7650,45 @@ pub struct imgINotificationObserver {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct imgINotificationObserver_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub const imgINotificationObserver_SIZE_AVAILABLE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::SIZE_AVAILABLE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::SIZE_AVAILABLE;
 pub const imgINotificationObserver_FRAME_UPDATE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::FRAME_UPDATE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::FRAME_UPDATE;
 pub const imgINotificationObserver_FRAME_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::FRAME_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::FRAME_COMPLETE;
 pub const imgINotificationObserver_LOAD_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::LOAD_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::LOAD_COMPLETE;
 pub const imgINotificationObserver_DECODE_COMPLETE:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::DECODE_COMPLETE;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::DECODE_COMPLETE;
 pub const imgINotificationObserver_DISCARD:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::DISCARD;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::DISCARD;
 pub const imgINotificationObserver_UNLOCKED_DRAW:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::UNLOCKED_DRAW;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::UNLOCKED_DRAW;
 pub const imgINotificationObserver_IS_ANIMATED:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::IS_ANIMATED;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::IS_ANIMATED;
 pub const imgINotificationObserver_HAS_TRANSPARENCY:
-          imgINotificationObserver__bindgen_ty_bindgen_id_222937 =
-    imgINotificationObserver__bindgen_ty_bindgen_id_222937::HAS_TRANSPARENCY;
+          imgINotificationObserver__bindgen_ty_1 =
+    imgINotificationObserver__bindgen_ty_1::HAS_TRANSPARENCY;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum imgINotificationObserver__bindgen_ty_bindgen_id_222937 {
+pub enum imgINotificationObserver__bindgen_ty_1 {
     SIZE_AVAILABLE = 1,
     FRAME_UPDATE = 2,
     FRAME_COMPLETE = 3,
     LOAD_COMPLETE = 4,
     DECODE_COMPLETE = 5,
     DISCARD = 6,
     UNLOCKED_DRAW = 7,
     IS_ANIMATED = 8,
@@ -8015,23 +7926,21 @@ pub struct gfxFontFeatureValueSet_Featur
     pub mKey: gfxFontFeatureValueSet_FeatureValueHashKey,
     pub mValues: nsTArray<::std::os::raw::c_uint>,
 }
 pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyType =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 pub type gfxFontFeatureValueSet_FeatureValueHashEntry_KeyTypePointer =
     *const gfxFontFeatureValueSet_FeatureValueHashKey;
 pub const gfxFontFeatureValueSet_FeatureValueHashEntry_ALLOW_MEMMOVE:
-          gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_224181
-          =
-    gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_224181::ALLOW_MEMMOVE;
+          gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 =
+    gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1::ALLOW_MEMMOVE;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_bindgen_id_224181
-         {
+pub enum gfxFontFeatureValueSet_FeatureValueHashEntry__bindgen_ty_1 {
     ALLOW_MEMMOVE = 1,
 }
 #[test]
 fn bindgen_test_layout_gfxFontFeatureValueSet_FeatureValueHashEntry() {
     assert_eq!(::std::mem::size_of::<gfxFontFeatureValueSet_FeatureValueHashEntry>()
                , 56usize);
     assert_eq!(::std::mem::align_of::<gfxFontFeatureValueSet_FeatureValueHashEntry>()
                , 8usize);
@@ -8371,33 +8280,31 @@ pub enum nsStyleUnit {
     eStyleUnit_FlexFraction = 16,
     eStyleUnit_Coord = 20,
     eStyleUnit_Integer = 30,
     eStyleUnit_Enumerated = 32,
     eStyleUnit_Calc = 40,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_bindgen_id_224798 {
+pub struct _bindgen_ty_26 {
     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_224798() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_bindgen_id_224798>() ,
-               8usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_bindgen_id_224798>() ,
-               8usize);
-}
-impl Clone for _bindgen_ty_bindgen_id_224798 {
-    fn clone(&self) -> Self { *self }
-}
-pub type nsStyleUnion = _bindgen_ty_bindgen_id_224798;
+fn bindgen_test_layout__bindgen_ty_26() {
+    assert_eq!(::std::mem::size_of::<_bindgen_ty_26>() , 8usize);
+    assert_eq!(::std::mem::align_of::<_bindgen_ty_26>() , 8usize);
+}
+impl Clone for _bindgen_ty_26 {
+    fn clone(&self) -> Self { *self }
+}
+pub type nsStyleUnion = _bindgen_ty_26;
 /**
  * Class that hold a single size specification used by the style
  * system.  The size specification consists of two parts -- a number
  * and a unit.  The number is an integer, a floating point value, an
  * nscoord, or undefined, and the unit is an nsStyleUnit.  Checking
  * the unit is a must before asking for the value in any particular
  * form.
  */
@@ -10200,34 +10107,34 @@ fn bindgen_test_layout_imgRequestProxy_i
                8usize);
 }
 #[test]
 fn bindgen_test_layout_imgRequestProxy() {
     assert_eq!(::std::mem::size_of::<imgRequestProxy>() , 120usize);
     assert_eq!(::std::mem::align_of::<imgRequestProxy>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_235464 {
+pub struct IProgressObserver__bindgen_vtable {
 }
 /**
  * An interface for observing changes to image state, as reported by
  * ProgressTracker.
  *
  * This is the ImageLib-internal version of imgINotificationObserver,
  * essentially, with implementation details that code outside of ImageLib
  * shouldn't see.
  *
  * XXX(seth): It's preferable to avoid adding anything to this interface if
  * possible.  In the long term, it would be ideal to get to a place where we can
  * just use the imgINotificationObserver interface internally as well.
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct IProgressObserver {
-    pub vtable_: *const bindgen_vtable__bindgen_id_235464,
+    pub vtable_: *const IProgressObserver__bindgen_vtable,
     pub _base: u64,
 }
 #[test]
 fn bindgen_test_layout_IProgressObserver() {
     assert_eq!(::std::mem::size_of::<IProgressObserver>() , 16usize);
     assert_eq!(::std::mem::align_of::<IProgressObserver>() , 8usize);
 }
 #[repr(C)]
@@ -10238,33 +10145,33 @@ pub struct nsISupportsPriority {
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct nsISupportsPriority_COMTypeInfo<T, U> {
     pub _address: u8,
     pub _phantom_0: ::std::marker::PhantomData<T>,
     pub _phantom_1: ::std::marker::PhantomData<U>,
 }
 pub const nsISupportsPriority_PRIORITY_HIGHEST:
-          nsISupportsPriority__bindgen_ty_bindgen_id_235540 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_235540::PRIORITY_HIGHEST;
-pub const nsISupportsPriority_PRIORITY_HIGH:
-          nsISupportsPriority__bindgen_ty_bindgen_id_235540 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_235540::PRIORITY_HIGH;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_HIGHEST;
+pub const nsISupportsPriority_PRIORITY_HIGH: nsISupportsPriority__bindgen_ty_1
+          =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_HIGH;
 pub const nsISupportsPriority_PRIORITY_NORMAL:
-          nsISupportsPriority__bindgen_ty_bindgen_id_235540 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_235540::PRIORITY_NORMAL;
-pub const nsISupportsPriority_PRIORITY_LOW:
-          nsISupportsPriority__bindgen_ty_bindgen_id_235540 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_235540::PRIORITY_LOW;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_NORMAL;
+pub const nsISupportsPriority_PRIORITY_LOW: nsISupportsPriority__bindgen_ty_1
+          =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_LOW;
 pub const nsISupportsPriority_PRIORITY_LOWEST:
-          nsISupportsPriority__bindgen_ty_bindgen_id_235540 =
-    nsISupportsPriority__bindgen_ty_bindgen_id_235540::PRIORITY_LOWEST;
+          nsISupportsPriority__bindgen_ty_1 =
+    nsISupportsPriority__bindgen_ty_1::PRIORITY_LOWEST;
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsISupportsPriority__bindgen_ty_bindgen_id_235540 {
+pub enum nsISupportsPriority__bindgen_ty_1 {
     PRIORITY_HIGHEST = -20,
     PRIORITY_HIGH = -10,
     PRIORITY_NORMAL = 0,
     PRIORITY_LOW = 10,
     PRIORITY_LOWEST = 20,
 }
 #[test]
 fn bindgen_test_layout_nsISupportsPriority() {
@@ -10688,33 +10595,33 @@ pub type nsCSSValueFloatColor_HasThreadS
 fn bindgen_test_layout_nsCSSValueFloatColor() {
     assert_eq!(::std::mem::size_of::<nsCSSValueFloatColor>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsCSSValueFloatColor>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsCSSValue {
     pub mUnit: nsCSSUnit,
-    pub mValue: nsCSSValue__bindgen_ty_bindgen_id_238585,
+    pub mValue: nsCSSValue__bindgen_ty_1,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsCSSValue_Array {
     pub mRefCnt: usize,
     pub mCount: usize,
     pub mArray: [nsCSSValue; 1usize],
 }
 #[test]
 fn bindgen_test_layout_nsCSSValue_Array() {
     assert_eq!(::std::mem::size_of::<nsCSSValue_Array>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsCSSValue_Array>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsCSSValue__bindgen_ty_bindgen_id_238585 {
+pub struct nsCSSValue__bindgen_ty_1 {
     pub mInt: __BindgenUnionField<i32>,
     pub mFloat: __BindgenUnionField<f32>,
     pub mString: __BindgenUnionField<*mut nsStringBuffer>,
     pub mColor: __BindgenUnionField<nscolor>,
     pub mArray: __BindgenUnionField<*mut nsCSSValue_Array>,
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub mImage: __BindgenUnionField<*mut ImageValue>,
     pub mGridTemplateAreas: __BindgenUnionField<*mut GridTemplateAreasValue>,
@@ -10729,23 +10636,21 @@ pub struct nsCSSValue__bindgen_ty_bindge
     pub mPairList: __BindgenUnionField<*mut nsCSSValuePairList_heap>,
     pub mPairListDependent: __BindgenUnionField<*mut nsCSSValuePairList>,
     pub mFloatColor: __BindgenUnionField<*mut nsCSSValueFloatColor>,
     pub mFontFamilyList: __BindgenUnionField<*mut FontFamilyListRefCnt>,
     pub mComplexColor: __BindgenUnionField<*mut ComplexColorValue>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsCSSValue__bindgen_ty_bindgen_id_238585() {
-    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_bindgen_id_238585>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_bindgen_id_238585>()
-               , 8usize);
-}
-impl Clone for nsCSSValue__bindgen_ty_bindgen_id_238585 {
+fn bindgen_test_layout_nsCSSValue__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsCSSValue__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsCSSValue__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsCSSValue__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsCSSValue() {
     assert_eq!(::std::mem::size_of::<nsCSSValue>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsCSSValue>() , 8usize);
 }
 #[repr(C)]
@@ -10816,22 +10721,22 @@ fn bindgen_test_layout_CSSVariableValues
     assert_eq!(::std::mem::align_of::<CSSVariableValues_Variable>() , 8usize);
 }
 #[test]
 fn bindgen_test_layout_CSSVariableValues() {
     assert_eq!(::std::mem::size_of::<CSSVariableValues>() , 48usize);
     assert_eq!(::std::mem::align_of::<CSSVariableValues>() , 8usize);
 }
 #[repr(C)]
-pub struct bindgen_vtable__bindgen_id_239669 {
+pub struct CounterStyle__bindgen_vtable {
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct CounterStyle {
-    pub vtable_: *const bindgen_vtable__bindgen_id_239669,
+    pub vtable_: *const CounterStyle__bindgen_vtable,
     pub mStyle: i32,
 }
 #[test]
 fn bindgen_test_layout_CounterStyle() {
     assert_eq!(::std::mem::size_of::<CounterStyle>() , 16usize);
     assert_eq!(::std::mem::align_of::<CounterStyle>() , 8usize);
 }
 impl Clone for CounterStyle {
@@ -11041,35 +10946,33 @@ fn bindgen_test_layout_CachedBorderImage
  * image of type (1)).
  */
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleImage {
     pub mCachedBIData: UniquePtr<CachedBorderImageData,
                                  DefaultDelete<CachedBorderImageData>>,
     pub mType: nsStyleImageType,
-    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_bindgen_id_241659,
+    pub __bindgen_anon_1: nsStyleImage__bindgen_ty_1,
     pub mCropRect: UniquePtr<nsStyleSides, DefaultDelete<nsStyleSides>>,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleImage__bindgen_ty_bindgen_id_241659 {
+pub struct nsStyleImage__bindgen_ty_1 {
     pub mImage: __BindgenUnionField<*mut nsStyleImageRequest>,
     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_241659() {
-    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_bindgen_id_241659>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_bindgen_id_241659>()
-               , 8usize);
-}
-impl Clone for nsStyleImage__bindgen_ty_bindgen_id_241659 {
+fn bindgen_test_layout_nsStyleImage__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleImage__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleImage__bindgen_ty_1>() , 8usize);
+}
+impl Clone for nsStyleImage__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleImage() {
     assert_eq!(::std::mem::size_of::<nsStyleImage>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsStyleImage>() , 8usize);
 }
 #[repr(C)]
@@ -11108,55 +11011,43 @@ pub struct nsStyleImageLayers {
     pub mPositionYCount: u32,
     pub mImageCount: u32,
     pub mSizeCount: u32,
     pub mMaskModeCount: u32,
     pub mBlendModeCount: u32,
     pub mCompositeCount: u32,
     pub mLayers: nsStyleAutoArray<nsStyleImageLayers_Layer>,
 }
-pub const nsStyleImageLayers_shorthand:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::shorthand;
-pub const nsStyleImageLayers_color:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::color;
-pub const nsStyleImageLayers_image:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::image;
-pub const nsStyleImageLayers_repeat:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::repeat;
-pub const nsStyleImageLayers_positionX:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::positionX;
-pub const nsStyleImageLayers_positionY:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::positionY;
-pub const nsStyleImageLayers_clip:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::clip;
-pub const nsStyleImageLayers_origin:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::origin;
-pub const nsStyleImageLayers_size:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::size;
-pub const nsStyleImageLayers_attachment:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::attachment;
-pub const nsStyleImageLayers_maskMode:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::maskMode;
-pub const nsStyleImageLayers_composite:
-          nsStyleImageLayers__bindgen_ty_bindgen_id_241721 =
-    nsStyleImageLayers__bindgen_ty_bindgen_id_241721::composite;
+pub const nsStyleImageLayers_shorthand: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::shorthand;
+pub const nsStyleImageLayers_color: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::color;
+pub const nsStyleImageLayers_image: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::image;
+pub const nsStyleImageLayers_repeat: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::repeat;
+pub const nsStyleImageLayers_positionX: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::positionX;
+pub const nsStyleImageLayers_positionY: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::positionY;
+pub const nsStyleImageLayers_clip: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::clip;
+pub const nsStyleImageLayers_origin: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::origin;
+pub const nsStyleImageLayers_size: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::size;
+pub const nsStyleImageLayers_attachment: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::attachment;
+pub const nsStyleImageLayers_maskMode: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::maskMode;
+pub const nsStyleImageLayers_composite: nsStyleImageLayers__bindgen_ty_1 =
+    nsStyleImageLayers__bindgen_ty_1::composite;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleImageLayers__bindgen_ty_bindgen_id_241721 {
+pub enum nsStyleImageLayers__bindgen_ty_1 {
     shorthand = 0,
     color = 1,
     image = 2,
     repeat = 3,
     positionX = 4,
     positionY = 5,
     clip = 6,
     origin = 7,
@@ -11337,55 +11228,54 @@ pub struct nsStyleBorder {
     pub mBorderImageWidth: nsStyleSides,
     pub mBorderImageOutset: nsStyleSides,
     pub mBorderImageFill: u8,
     pub mBorderImageRepeatH: u8,
     pub mBorderImageRepeatV: u8,
     pub mFloatEdge: StyleFloatEdge,
     pub mBoxDecorationBreak: StyleBoxDecorationBreak,
     pub mBorderStyle: [u8; 4usize],
-    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_bindgen_id_242391,
+    pub __bindgen_anon_1: nsStyleBorder__bindgen_ty_1,
     pub mComputedBorder: nsMargin,
     pub mBorder: nsMargin,
     pub mTwipsPerPixel: nscoord,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleBorder__bindgen_ty_bindgen_id_242391 {
-    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392>,
+pub struct nsStyleBorder__bindgen_ty_1 {
+    pub __bindgen_anon_1: __BindgenUnionField<nsStyleBorder__bindgen_ty_1_1>,
     pub mBorderColor: __BindgenUnionField<[StyleComplexColor; 4usize]>,
     pub bindgen_union_field: [u32; 8usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392 {
+pub struct nsStyleBorder__bindgen_ty_1_1 {
     pub mBorderTopColor: StyleComplexColor,
     pub mBorderRightColor: StyleComplexColor,
     pub mBorderBottomColor: StyleComplexColor,
     pub mBorderLeftColor: StyleComplexColor,
 }
 #[test]
-fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392>()
-               , 32usize);
-    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392>()
-               , 4usize);
-}
-impl Clone for
- nsStyleBorder__bindgen_ty_bindgen_id_242391__bindgen_ty_bindgen_id_242392 {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_nsStyleBorder__bindgen_ty_bindgen_id_242391() {
-    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_bindgen_id_242391>()
-               , 32usize);
-    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_bindgen_id_242391>()
-               , 4usize);
-}
-impl Clone for nsStyleBorder__bindgen_ty_bindgen_id_242391 {
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_1_1>() ,
+               32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_1_1>() ,
+               4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_1_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsStyleBorder__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleBorder__bindgen_ty_1>() ,
+               32usize);
+    assert_eq!(::std::mem::align_of::<nsStyleBorder__bindgen_ty_1>() ,
+               4usize);
+}
+impl Clone for nsStyleBorder__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleBorder() {
     assert_eq!(::std::mem::size_of::<nsStyleBorder>() , 312usize);
     assert_eq!(::std::mem::align_of::<nsStyleBorder>() , 8usize);
 }
 #[repr(C)]
@@ -11448,24 +11338,18 @@ fn bindgen_test_layout_nsStyleList() {
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleGridLine {
     pub mHasSpan: bool,
     pub mInteger: i32,
     pub mLineName: nsString,
 }
-extern "C" {
-    #[link_name = "_ZN15nsStyleGridLine8kMinLineE"]
-    pub static nsStyleGridLine_kMinLine: i32;
-}
-extern "C" {
-    #[link_name = "_ZN15nsStyleGridLine8kMaxLineE"]
-    pub static nsStyleGridLine_kMaxLine: i32;
-}
+pub const nsStyleGridLine_kMinLine: i32 = -10000;
+pub const nsStyleGridLine_kMaxLine: i32 = 10000;
 #[test]
 fn bindgen_test_layout_nsStyleGridLine() {
     assert_eq!(::std::mem::size_of::<nsStyleGridLine>() , 24usize);
     assert_eq!(::std::mem::align_of::<nsStyleGridLine>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleGridTemplate {
@@ -11682,17 +11566,17 @@ fn bindgen_test_layout_nsStyleImageOrien
 }
 impl Clone for nsStyleImageOrientation {
     fn clone(&self) -> Self { *self }
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsTimingFunction {
     pub mType: nsTimingFunction_Type,
-    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_bindgen_id_243387,
+    pub __bindgen_anon_1: nsTimingFunction__bindgen_ty_1,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsTimingFunction_Type {
     Ease = 0,
     Linear = 1,
     EaseIn = 2,
     EaseOut = 3,
@@ -11701,66 +11585,62 @@ pub enum nsTimingFunction_Type {
     StepEnd = 6,
     CubicBezier = 7,
 }
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsTimingFunction_Keyword { Implicit = 0, Explicit = 1, }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_243387 {
-    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388>,
-    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399>,
+pub struct nsTimingFunction__bindgen_ty_1 {
+    pub mFunc: __BindgenUnionField<nsTimingFunction__bindgen_ty_1_1>,
+    pub __bindgen_anon_1: __BindgenUnionField<nsTimingFunction__bindgen_ty_1_2>,
     pub bindgen_union_field: [u32; 4usize],
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388 {
+pub struct nsTimingFunction__bindgen_ty_1_1 {
     pub mX1: f32,
     pub mY1: f32,
     pub mX2: f32,
     pub mY2: f32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388>()
-               , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388>()
-               , 4usize);
-}
-impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243388
- {
-    fn clone(&self) -> Self { *self }
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399 {
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1_1() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1_1>() ,
+               16usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1_1>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1_1 {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsTimingFunction__bindgen_ty_1_2 {
     pub mSteps: u32,
 }
 #[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399>()
-               , 4usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399>()
-               , 4usize);
-}
-impl Clone for
- nsTimingFunction__bindgen_ty_bindgen_id_243387__bindgen_ty_bindgen_id_243399
- {
-    fn clone(&self) -> Self { *self }
-}
-#[test]
-fn bindgen_test_layout_nsTimingFunction__bindgen_ty_bindgen_id_243387() {
-    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387>()
-               , 16usize);
-    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_bindgen_id_243387>()
-               , 4usize);
-}
-impl Clone for nsTimingFunction__bindgen_ty_bindgen_id_243387 {
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1_2() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1_2>() ,
+               4usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1_2>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1_2 {
+    fn clone(&self) -> Self { *self }
+}
+#[test]
+fn bindgen_test_layout_nsTimingFunction__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsTimingFunction__bindgen_ty_1>() ,
+               16usize);
+    assert_eq!(::std::mem::align_of::<nsTimingFunction__bindgen_ty_1>() ,
+               4usize);
+}
+impl Clone for nsTimingFunction__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsTimingFunction() {
     assert_eq!(::std::mem::size_of::<nsTimingFunction>() , 20usize);
     assert_eq!(::std::mem::align_of::<nsTimingFunction>() , 4usize);
 }
 impl Clone for nsTimingFunction {
@@ -11811,23 +11691,23 @@ pub type StyleBasicShape_HasThreadSafeRe
 #[test]
 fn bindgen_test_layout_StyleBasicShape() {
     assert_eq!(::std::mem::size_of::<StyleBasicShape>() , 120usize);
     assert_eq!(::std::mem::align_of::<StyleBasicShape>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct StyleShapeSource<ReferenceBox> {
-    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_bindgen_id_243770<ReferenceBox>,
+    pub __bindgen_anon_1: StyleShapeSource__bindgen_ty_1<ReferenceBox>,
     pub mType: StyleShapeSourceType,
     pub mReferenceBox: ReferenceBox,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
-pub struct StyleShapeSource__bindgen_ty_bindgen_id_243770<ReferenceBox> {
+pub struct StyleShapeSource__bindgen_ty_1<ReferenceBox> {
     pub mBasicShape: __BindgenUnionField<*mut StyleBasicShape>,
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub bindgen_union_field: u64,
     pub _phantom_0: ::std::marker::PhantomData<ReferenceBox>,
 }
 pub type StyleClipPath = StyleShapeSource<StyleClipPathGeometryBox>;
 pub type StyleShapeOutside = StyleShapeSource<StyleShapeOutsideShapeBox>;
 #[repr(C)]
@@ -11869,34 +11749,34 @@ pub enum nsStyleContentType {
     eStyleContentType_NoCloseQuote = 43,
     eStyleContentType_AltContent = 50,
     eStyleContentType_Uninitialized = 51,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleContentData {
     pub mType: nsStyleContentType,
-    pub mContent: nsStyleContentData__bindgen_ty_bindgen_id_243872,
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsStyleContentData__bindgen_ty_bindgen_id_243872 {
+    pub mContent: nsStyleContentData__bindgen_ty_1,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleContentData__bindgen_ty_1 {
     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_243872() {
-    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_bindgen_id_243872>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_bindgen_id_243872>()
-               , 8usize);
-}
-impl Clone for nsStyleContentData__bindgen_ty_bindgen_id_243872 {
+fn bindgen_test_layout_nsStyleContentData__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleContentData__bindgen_ty_1>() ,
+               8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleContentData__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleContentData__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleContentData() {
     assert_eq!(::std::mem::size_of::<nsStyleContentData>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsStyleContentData>() , 8usize);
 }
 #[repr(C)]
@@ -11987,20 +11867,17 @@ pub struct nsStyleColumn {
     pub mColumnWidth: nsStyleCoord,
     pub mColumnGap: nsStyleCoord,
     pub mColumnRuleColor: StyleComplexColor,
     pub mColumnRuleStyle: u8,
     pub mColumnFill: u8,
     pub mColumnRuleWidth: nscoord,
     pub mTwipsPerPixel: nscoord,
 }
-extern "C" {
-    #[link_name = "_ZN13nsStyleColumn15kMaxColumnCountE"]
-    pub static nsStyleColumn_kMaxColumnCount: u32;
-}
+pub const nsStyleColumn_kMaxColumnCount: u32 = 1000;
 #[test]
 fn bindgen_test_layout_nsStyleColumn() {
     assert_eq!(::std::mem::size_of::<nsStyleColumn>() , 64usize);
     assert_eq!(::std::mem::align_of::<nsStyleColumn>() , 8usize);
 }
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum nsStyleSVGPaintType {
@@ -12008,35 +11885,35 @@ pub enum nsStyleSVGPaintType {
     eStyleSVGPaintType_Color = 2,
     eStyleSVGPaintType_Server = 3,
     eStyleSVGPaintType_ContextFill = 4,
     eStyleSVGPaintType_ContextStroke = 5,
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleSVGPaint {
-    pub mPaint: nsStyleSVGPaint__bindgen_ty_bindgen_id_244360,
+    pub mPaint: nsStyleSVGPaint__bindgen_ty_1,
     pub mType: nsStyleSVGPaintType,
     pub mFallbackColor: nscolor,
 }
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct nsStyleSVGPaint__bindgen_ty_bindgen_id_244360 {
+pub struct nsStyleSVGPaint__bindgen_ty_1 {
     pub mColor: __BindgenUnionField<nscolor>,
     pub mPaintServer: __BindgenUnionField<*mut URLValue>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_bindgen_id_244360() {
-    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_244360>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_bindgen_id_244360>()
-               , 8usize);
-}
-impl Clone for nsStyleSVGPaint__bindgen_ty_bindgen_id_244360 {
+fn bindgen_test_layout_nsStyleSVGPaint__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleSVGPaint__bindgen_ty_1>() ,
+               8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleSVGPaint__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleSVGPaint__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleSVGPaint() {
     assert_eq!(::std::mem::size_of::<nsStyleSVGPaint>() , 16usize);
     assert_eq!(::std::mem::align_of::<nsStyleSVGPaint>() , 8usize);
 }
 #[repr(C)]
@@ -12059,40 +11936,33 @@ pub struct nsStyleSVG {
     pub mFillRule: StyleFillRule,
     pub mPaintOrder: u8,
     pub mShapeRendering: u8,
     pub mStrokeLinecap: u8,
     pub mStrokeLinejoin: u8,
     pub mTextAnchor: u8,
     pub mContextFlags: u8,
 }
-pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::FILL_OPACITY_SOURCE_MASK;
-pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::STROKE_OPACITY_SOURCE_MASK;
-pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::STROKE_DASHARRAY_CONTEXT;
-pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::STROKE_DASHOFFSET_CONTEXT;
-pub const nsStyleSVG_STROKE_WIDTH_CONTEXT:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::STROKE_WIDTH_CONTEXT;
-pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::FILL_OPACITY_SOURCE_SHIFT;
-pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT:
-          nsStyleSVG__bindgen_ty_bindgen_id_244529 =
-    nsStyleSVG__bindgen_ty_bindgen_id_244529::STROKE_OPACITY_SOURCE_SHIFT;
+pub const nsStyleSVG_FILL_OPACITY_SOURCE_MASK: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::FILL_OPACITY_SOURCE_MASK;
+pub const nsStyleSVG_STROKE_OPACITY_SOURCE_MASK: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_OPACITY_SOURCE_MASK;
+pub const nsStyleSVG_STROKE_DASHARRAY_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_DASHARRAY_CONTEXT;
+pub const nsStyleSVG_STROKE_DASHOFFSET_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_DASHOFFSET_CONTEXT;
+pub const nsStyleSVG_STROKE_WIDTH_CONTEXT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_WIDTH_CONTEXT;
+pub const nsStyleSVG_FILL_OPACITY_SOURCE_SHIFT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::FILL_OPACITY_SOURCE_SHIFT;
+pub const nsStyleSVG_STROKE_OPACITY_SOURCE_SHIFT: nsStyleSVG__bindgen_ty_1 =
+    nsStyleSVG__bindgen_ty_1::STROKE_OPACITY_SOURCE_SHIFT;
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum nsStyleSVG__bindgen_ty_bindgen_id_244529 {
+pub enum nsStyleSVG__bindgen_ty_1 {
     FILL_OPACITY_SOURCE_MASK = 3,
     STROKE_OPACITY_SOURCE_MASK = 12,
     STROKE_DASHARRAY_CONTEXT = 16,
     STROKE_DASHOFFSET_CONTEXT = 32,
     STROKE_WIDTH_CONTEXT = 64,
     FILL_OPACITY_SOURCE_SHIFT = 0,
     STROKE_OPACITY_SOURCE_SHIFT = 2,
 }
@@ -12101,33 +11971,32 @@ fn bindgen_test_layout_nsStyleSVG() {
     assert_eq!(::std::mem::size_of::<nsStyleSVG>() , 120usize);
     assert_eq!(::std::mem::align_of::<nsStyleSVG>() , 8usize);
 }
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsStyleFilter {
     pub mType: u32,
     pub mFilterParameter: nsStyleCoord,
-    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_bindgen_id_244604,
-}
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct nsStyleFilter__bindgen_ty_bindgen_id_244604 {
+    pub __bindgen_anon_1: nsStyleFilter__bindgen_ty_1,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct nsStyleFilter__bindgen_ty_1 {
     pub mURL: __BindgenUnionField<*mut URLValue>,
     pub mDropShadow: __BindgenUnionField<*mut nsCSSShadowArray>,
     pub bindgen_union_field: u64,
 }
 #[test]
-fn bindgen_test_layout_nsStyleFilter__bindgen_ty_bindgen_id_244604() {
-    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_bindgen_id_244604>()
-               , 8usize);
-    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_bindgen_id_244604>()
-               , 8usize);
-}
-impl Clone for nsStyleFilter__bindgen_ty_bindgen_id_244604 {
+fn bindgen_test_layout_nsStyleFilter__bindgen_ty_1() {
+    assert_eq!(::std::mem::size_of::<nsStyleFilter__bindgen_ty_1>() , 8usize);
+    assert_eq!(::std::mem::align_of::<nsStyleFilter__bindgen_ty_1>() ,
+               8usize);
+}
+impl Clone for nsStyleFilter__bindgen_ty_1 {
     fn clone(&self) -> Self { *self }
 }
 #[test]
 fn bindgen_test_layout_nsStyleFilter() {
     assert_eq!(::std::mem::size_of::<nsStyleFilter>() , 32usize);
     assert_eq!(::std::mem::align_of::<nsStyleFilter>() , 8usize);
 }
 #[repr(C)]