Auto merge of #14909 - heycam:bindings-update-16, r=Manishearth

stylo: update bindings

Bindings update for https://treeherder.mozilla.org/#/jobs?repo=stylo&revision=5a96506c9435a414d37308298f526d25ea402607.

r? @Manishearth

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

6 files changed, 314 insertions, 294 deletions

diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs
index 2b75121f1d0..161a0e86f1f 100644
--- a/components/style/build_gecko.rs
+++ b/components/style/build_gecko.rs
@@ -244,7 +244,6 @@ mod bindings {
             "NODE_.*",
             "NS_FONT_.*",
             "NS_STYLE_.*",
-            "NS_CORNER_.*",
             "NS_RADIUS_.*",
             "BORDER_COLOR_.*",
             "BORDER_STYLE_.*"
@@ -256,6 +255,7 @@ mod bindings {
             "mozilla::ConsumeStyleBehavior",
             "mozilla::CSSPseudoClassType",
             "mozilla::css::SheetParsingMode",
+            "mozilla::HalfCorner",
             "mozilla::TraversalRootBehavior",
             "mozilla::DisplayItemClip",  // Needed because bindgen generates
                                          // specialization tests for this even
@@ -279,6 +279,7 @@ mod bindings {
             "gfxFontFeature",
             "gfxFontVariation",
             "GridNamedArea",
+            "HalfCorner",
             "Image",
             "ImageURL",
             "nsAttrName",
diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs
index a9b73f54e8f..1546e6a6950 100644
--- a/components/style/gecko_bindings/bindings.rs
+++ b/components/style/gecko_bindings/bindings.rs
@@ -632,6 +632,11 @@ extern "C" {
                                              nsStyleImageLayers_LayerType);
 }
 extern "C" {
+    pub fn Gecko_EnsureStyleAnimationArrayLength(array:
+                                                     *mut ::std::os::raw::c_void,
+                                                 len: usize);
+}
+extern "C" {
     pub fn Gecko_ResetStyleCoord(unit: *mut nsStyleUnit,
                                  value: *mut nsStyleUnion);
 }
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
index bb2f68ee737..8560f3b6ccb 100644
--- a/components/style/gecko_bindings/structs_debug.rs
+++ b/components/style/gecko_bindings/structs_debug.rs
@@ -226,14 +226,6 @@ pub mod root {
         250;
     pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
     pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
-    pub const NS_CORNER_TOP_LEFT_X: ::std::os::raw::c_uint = 0;
-    pub const NS_CORNER_TOP_LEFT_Y: ::std::os::raw::c_uint = 1;
-    pub const NS_CORNER_TOP_RIGHT_X: ::std::os::raw::c_uint = 2;
-    pub const NS_CORNER_TOP_RIGHT_Y: ::std::os::raw::c_uint = 3;
-    pub const NS_CORNER_BOTTOM_RIGHT_X: ::std::os::raw::c_uint = 4;
-    pub const NS_CORNER_BOTTOM_RIGHT_Y: ::std::os::raw::c_uint = 5;
-    pub const NS_CORNER_BOTTOM_LEFT_X: ::std::os::raw::c_uint = 6;
-    pub const NS_CORNER_BOTTOM_LEFT_Y: ::std::os::raw::c_uint = 7;
     pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint =
         1;
@@ -761,9 +753,6 @@ pub mod root {
     pub const NS_STYLE_WORDBREAK_KEEP_ALL: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_OVERFLOWWRAP_NORMAL: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_OVERFLOWWRAP_BREAK_WORD: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_HYPHENS_NONE: ::std::os::raw::c_uint = 0;
-    pub const NS_STYLE_HYPHENS_MANUAL: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_HYPHENS_AUTO: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_RUBY_ALIGN_START: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_RUBY_ALIGN_CENTER: ::std::os::raw::c_uint = 1;
     pub const NS_STYLE_RUBY_ALIGN_SPACE_BETWEEN: ::std::os::raw::c_uint = 2;
@@ -1372,9 +1361,6 @@ pub mod root {
             impl Clone for AudioContext {
                 fn clone(&self) -> Self { *self }
             }
-            pub const ReferrerPolicy_RP_Default:
-                      root::mozilla::dom::ReferrerPolicy =
-                ReferrerPolicy::RP_No_Referrer_When_Downgrade;
             #[repr(u32)]
             #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
             pub enum ReferrerPolicy {
@@ -2332,6 +2318,7 @@ pub mod root {
             pub mTitle: ::nsstring::nsStringRepr,
             pub mDocument: *mut root::nsIDocument,
             pub mOwningNode: *mut root::nsINode,
+            pub mMedia: root::RefPtr<root::nsMediaList>,
             pub mParsingMode: root::mozilla::css::SheetParsingMode,
             pub mType: root::StyleBackendType,
             pub mDisabled: bool,
@@ -2359,7 +2346,7 @@ pub mod root {
         }
         #[test]
         fn bindgen_test_layout_StyleSheet() {
-            assert_eq!(::std::mem::size_of::<StyleSheet>() , 88usize);
+            assert_eq!(::std::mem::size_of::<StyleSheet>() , 96usize);
             assert_eq!(::std::mem::align_of::<StyleSheet>() , 8usize);
         }
         #[repr(C)]
@@ -2378,6 +2365,18 @@ pub mod root {
             eSideBottom = 2,
             eSideLeft = 3,
         }
+        #[repr(u32)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum HalfCorner {
+            eCornerTopLeftX = 0,
+            eCornerTopLeftY = 1,
+            eCornerTopRightX = 2,
+            eCornerTopRightY = 3,
+            eCornerBottomRightX = 4,
+            eCornerBottomRightY = 5,
+            eCornerBottomLeftX = 6,
+            eCornerBottomLeftY = 7,
+        }
         #[repr(C)]
         #[derive(Debug, Copy)]
         pub struct SVGAttrAnimationRuleProcessor {
@@ -2757,6 +2756,9 @@ pub mod root {
         pub enum StyleFloatEdge { ContentBox = 0, MarginBox = 1, }
         #[repr(u8)]
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum StyleHyphens { None = 0, Manual = 1, Auto = 2, }
+        #[repr(u8)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub enum StyleShapeOutsideShapeBox {
             NoBox = 0,
             Content = 1,
@@ -3055,6 +3057,93 @@ pub mod root {
             assert_eq!(::std::mem::align_of::<root::mozilla::DefaultDelete<root::RawServoStyleSet>>()
                        , 1usize);
         }
+        #[repr(u8)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum CSSPseudoClassType {
+            empty = 0,
+            mozOnlyWhitespace = 1,
+            mozEmptyExceptChildrenWithLocalname = 2,
+            lang = 3,
+            mozBoundElement = 4,
+            root = 5,
+            any = 6,
+            firstChild = 7,
+            firstNode = 8,
+            lastChild = 9,
+            lastNode = 10,
+            onlyChild = 11,
+            firstOfType = 12,
+            lastOfType = 13,
+            onlyOfType = 14,
+            nthChild = 15,
+            nthLastChild = 16,
+            nthOfType = 17,
+            nthLastOfType = 18,
+            mozIsHTML = 19,
+            unresolved = 20,
+            mozNativeAnonymous = 21,
+            mozSystemMetric = 22,
+            mozLocaleDir = 23,
+            mozLWTheme = 24,
+            mozLWThemeBrightText = 25,
+            mozLWThemeDarkText = 26,
+            mozWindowInactive = 27,
+            mozTableBorderNonzero = 28,
+            mozBrowserFrame = 29,
+            scope = 30,
+            negation = 31,
+            dir = 32,
+            link = 33,
+            mozAnyLink = 34,
+            anyLink = 35,
+            visited = 36,
+            active = 37,
+            checked = 38,
+            disabled = 39,
+            enabled = 40,
+            focus = 41,
+            focusWithin = 42,
+            hover = 43,
+            mozDragOver = 44,
+            target = 45,
+            indeterminate = 46,
+            mozDevtoolsHighlighted = 47,
+            mozStyleeditorTransitioning = 48,
+            fullscreen = 49,
+            mozFullScreen = 50,
+            mozFocusRing = 51,
+            mozBroken = 52,
+            mozLoading = 53,
+            mozUserDisabled = 54,
+            mozSuppressed = 55,
+            mozHandlerClickToPlay = 56,
+            mozHandlerVulnerableUpdatable = 57,
+            mozHandlerVulnerableNoUpdate = 58,
+            mozHandlerDisabled = 59,
+            mozHandlerBlocked = 60,
+            mozHandlerCrashed = 61,
+            mozMathIncrementScriptLevel = 62,
+            required = 63,
+            optional = 64,
+            valid = 65,
+            invalid = 66,
+            inRange = 67,
+            outOfRange = 68,
+            defaultPseudo = 69,
+            placeholderShown = 70,
+            mozReadOnly = 71,
+            mozReadWrite = 72,
+            mozSubmitInvalid = 73,
+            mozUIInvalid = 74,
+            mozUIValid = 75,
+            mozMeterOptimum = 76,
+            mozMeterSubOptimum = 77,
+            mozMeterSubSubOptimum = 78,
+            mozPlaceholder = 79,
+            Count = 80,
+            NotPseudo = 81,
+            MAX = 82,
+        }
         #[repr(C)]
         #[derive(Debug)]
         pub struct CSSVariableValues {
@@ -3088,23 +3177,6 @@ pub mod root {
             assert_eq!(::std::mem::size_of::<CSSVariableValues>() , 56usize);
             assert_eq!(::std::mem::align_of::<CSSVariableValues>() , 8usize);
         }
-        #[repr(C)]
-        pub struct CounterStyle__bindgen_vtable {
-        }
-        #[repr(C)]
-        #[derive(Debug, Copy)]
-        pub struct CounterStyle {
-            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 {
-            fn clone(&self) -> Self { *self }
-        }
         pub mod image {
             #[allow(unused_imports)]
             use self::super::super::super::root;
@@ -3162,6 +3234,23 @@ pub mod root {
             }
         }
         #[repr(C)]
+        pub struct CounterStyle__bindgen_vtable {
+        }
+        #[repr(C)]
+        #[derive(Debug, Copy)]
+        pub struct CounterStyle {
+            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 {
+            fn clone(&self) -> Self { *self }
+        }
+        #[repr(C)]
         #[derive(Debug, Copy)]
         pub struct Position {
             pub mXPosition: root::mozilla::Position_Coord,
@@ -3243,93 +3332,6 @@ pub mod root {
             root::mozilla::StyleShapeSource<root::mozilla::StyleGeometryBox>;
         pub type StyleShapeOutside =
             root::mozilla::StyleShapeSource<root::mozilla::StyleShapeOutsideShapeBox>;
-        #[repr(u8)]
-        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-        pub enum CSSPseudoClassType {
-            empty = 0,
-            mozOnlyWhitespace = 1,
-            mozEmptyExceptChildrenWithLocalname = 2,
-            lang = 3,
-            mozBoundElement = 4,
-            root = 5,
-            any = 6,
-            firstChild = 7,
-            firstNode = 8,
-            lastChild = 9,
-            lastNode = 10,
-            onlyChild = 11,
-            firstOfType = 12,
-            lastOfType = 13,
-            onlyOfType = 14,
-            nthChild = 15,
-            nthLastChild = 16,
-            nthOfType = 17,
-            nthLastOfType = 18,
-            mozIsHTML = 19,
-            unresolved = 20,
-            mozNativeAnonymous = 21,
-            mozSystemMetric = 22,
-            mozLocaleDir = 23,
-            mozLWTheme = 24,
-            mozLWThemeBrightText = 25,
-            mozLWThemeDarkText = 26,
-            mozWindowInactive = 27,
-            mozTableBorderNonzero = 28,
-            mozBrowserFrame = 29,
-            scope = 30,
-            negation = 31,
-            dir = 32,
-            link = 33,
-            mozAnyLink = 34,
-            anyLink = 35,
-            visited = 36,
-            active = 37,
-            checked = 38,
-            disabled = 39,
-            enabled = 40,
-            focus = 41,
-            focusWithin = 42,
-            hover = 43,
-            mozDragOver = 44,
-            target = 45,
-            indeterminate = 46,
-            mozDevtoolsHighlighted = 47,
-            mozStyleeditorTransitioning = 48,
-            fullscreen = 49,
-            mozFullScreen = 50,
-            mozFocusRing = 51,
-            mozBroken = 52,
-            mozLoading = 53,
-            mozUserDisabled = 54,
-            mozSuppressed = 55,
-            mozHandlerClickToPlay = 56,
-            mozHandlerVulnerableUpdatable = 57,
-            mozHandlerVulnerableNoUpdate = 58,
-            mozHandlerDisabled = 59,
-            mozHandlerBlocked = 60,
-            mozHandlerCrashed = 61,
-            mozMathIncrementScriptLevel = 62,
-            required = 63,
-            optional = 64,
-            valid = 65,
-            invalid = 66,
-            inRange = 67,
-            outOfRange = 68,
-            defaultPseudo = 69,
-            placeholderShown = 70,
-            mozReadOnly = 71,
-            mozReadWrite = 72,
-            mozSubmitInvalid = 73,
-            mozUIInvalid = 74,
-            mozUIValid = 75,
-            mozMeterOptimum = 76,
-            mozMeterSubOptimum = 77,
-            mozMeterSubSubOptimum = 78,
-            mozPlaceholder = 79,
-            Count = 80,
-            NotPseudo = 81,
-            MAX = 82,
-        }
         #[test]
         fn __bindgen_test_layout_template_2() {
             assert_eq!(::std::mem::size_of::<root::mozilla::StyleShapeSource<root::mozilla::StyleGeometryBox>>()
@@ -4384,6 +4386,7 @@ pub mod root {
     pub struct nsCycleCollectionParticipant {
         pub vtable_: *const nsCycleCollectionParticipant__bindgen_vtable,
         pub mMightSkip: bool,
+        pub mTraverseShouldTrace: bool,
     }
     #[test]
     fn bindgen_test_layout_nsCycleCollectionParticipant() {
@@ -4861,8 +4864,7 @@ pub mod root {
    * 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_TRACE_PRESERVED_WRAPPER and
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
     #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -5063,7 +5065,7 @@ pub mod root {
         pub mStates: root::EventStates_InternalType,
     }
     pub type EventStates_InternalType = u64;
-    pub type EventStates_ServoType = u8;
+    pub type EventStates_ServoType = u16;
     #[test]
     fn bindgen_test_layout_EventStates() {
         assert_eq!(::std::mem::size_of::<EventStates>() , 8usize);
@@ -6540,6 +6542,12 @@ pub mod root {
         pub mFramesConstructed: u64,
         pub mFramesReflowed: u64,
         pub mReflowStartTime: root::mozilla::TimeStamp,
+        pub mFirstPaintTime: root::mozilla::TimeStamp,
+        pub mFirstClickTime: root::mozilla::TimeStamp,
+        pub mFirstKeyTime: root::mozilla::TimeStamp,
+        pub mFirstMouseMoveTime: root::mozilla::TimeStamp,
+        pub mFirstScrollTime: root::mozilla::TimeStamp,
+        pub mInteractionTimeEnabled: bool,
         pub mLastStyleUpdateForAllAnimations: root::mozilla::TimeStamp,
         pub _bitfield_1: u64,
         pub mRestyleLoggingEnabled: bool,
@@ -6576,6 +6584,14 @@ pub mod root {
         eContext_Print = 2,
         eContext_PageLayout = 3,
     }
+    #[repr(u32)]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+    pub enum nsPresContext_InteractionType {
+        eClickInteraction = 0,
+        eKeyInteraction = 1,
+        eMouseMoveInteraction = 2,
+        eScrollInteraction = 3,
+    }
     /**
    * A class that can be used to temporarily disable reflow interruption.
    */
@@ -6600,7 +6616,7 @@ pub mod root {
     }
     #[test]
     fn bindgen_test_layout_nsPresContext() {
-        assert_eq!(::std::mem::size_of::<nsPresContext>() , 1248usize);
+        assert_eq!(::std::mem::size_of::<nsPresContext>() , 1296usize);
         assert_eq!(::std::mem::align_of::<nsPresContext>() , 8usize);
     }
     impl nsPresContext {
@@ -7950,6 +7966,14 @@ pub mod root {
                                                        *mut ::std::os::raw::c_void)
                                   -> ::std::os::raw::c_int>;
     #[repr(C)]
+    #[derive(Debug, Copy)]
+    pub struct nsMediaList {
+        pub _address: u8,
+    }
+    impl Clone for nsMediaList {
+        fn clone(&self) -> Self { *self }
+    }
+    #[repr(C)]
     #[derive(Debug)]
     pub struct nsAttrValue {
         pub mBits: usize,
@@ -9220,10 +9244,6 @@ pub mod root {
     impl Clone for nsFrameManagerBase_UndisplayedMap {
         fn clone(&self) -> Self { *self }
     }
-    extern "C" {
-        #[link_name = "_ZN18nsFrameManagerBase23sGlobalGenerationNumberE"]
-        pub static mut nsFrameManagerBase_sGlobalGenerationNumber: u32;
-    }
     #[test]
     fn bindgen_test_layout_nsFrameManagerBase() {
         assert_eq!(::std::mem::size_of::<nsFrameManagerBase>() , 88usize);
@@ -11661,14 +11681,14 @@ pub mod root {
     pub type RawGeckoNode = root::nsINode;
     pub type RawGeckoElement = root::mozilla::dom::Element;
     pub type RawGeckoDocument = root::nsIDocument;
-    pub type RawGeckoPresContext = [u64; 156usize];
+    pub type RawGeckoPresContext = [u64; 162usize];
     pub type RawGeckoNodeBorrowed = *const root::RawGeckoNode;
     pub type RawGeckoNodeBorrowedOrNull = *const root::RawGeckoNode;
     pub type RawGeckoElementBorrowed = *const root::RawGeckoElement;
     pub type RawGeckoElementBorrowedOrNull = *const root::RawGeckoElement;
     pub type RawGeckoDocumentBorrowed = *const root::RawGeckoDocument;
     pub type RawGeckoDocumentBorrowedOrNull = *const root::RawGeckoDocument;
-    pub type RawGeckoPresContextBorrowed = *const [u64; 156usize];
+    pub type RawGeckoPresContextBorrowed = *const [u64; 162usize];
     #[repr(u32)]
     #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
     pub enum nsCSSTokenSerializationType {
@@ -11700,20 +11720,6 @@ pub mod root {
     }
     #[repr(C)]
     #[derive(Debug, Copy)]
-    pub struct LookAndFeelInt {
-        pub id: i32,
-        pub value: i32,
-    }
-    #[test]
-    fn bindgen_test_layout_LookAndFeelInt() {
-        assert_eq!(::std::mem::size_of::<LookAndFeelInt>() , 8usize);
-        assert_eq!(::std::mem::align_of::<LookAndFeelInt>() , 4usize);
-    }
-    impl Clone for LookAndFeelInt {
-        fn clone(&self) -> Self { *self }
-    }
-    #[repr(C)]
-    #[derive(Debug, Copy)]
     pub struct imgIContainer {
         pub _address: u8,
     }
@@ -12540,7 +12546,7 @@ pub mod root {
         pub mWhiteSpace: u8,
         pub mWordBreak: u8,
         pub mOverflowWrap: u8,
-        pub mHyphens: u8,
+        pub mHyphens: root::mozilla::StyleHyphens,
         pub mRubyAlign: u8,
         pub mRubyPosition: u8,
         pub mTextSizeAdjust: u8,
diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
index 00602c8f9c2..45058c648c6 100644
--- a/components/style/gecko_bindings/structs_release.rs
+++ b/components/style/gecko_bindings/structs_release.rs
@@ -226,14 +226,6 @@ pub mod root {
         250;
     pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
     pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
-    pub const NS_CORNER_TOP_LEFT_X: ::std::os::raw::c_uint = 0;
-    pub const NS_CORNER_TOP_LEFT_Y: ::std::os::raw::c_uint = 1;
-    pub const NS_CORNER_TOP_RIGHT_X: ::std::os::raw::c_uint = 2;
-    pub const NS_CORNER_TOP_RIGHT_Y: ::std::os::raw::c_uint = 3;
-    pub const NS_CORNER_BOTTOM_RIGHT_X: ::std::os::raw::c_uint = 4;
-    pub const NS_CORNER_BOTTOM_RIGHT_Y: ::std::os::raw::c_uint = 5;
-    pub const NS_CORNER_BOTTOM_LEFT_X: ::std::os::raw::c_uint = 6;
-    pub const NS_CORNER_BOTTOM_LEFT_Y: ::std::os::raw::c_uint = 7;
     pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint =
         1;
@@ -761,9 +753,6 @@ pub mod root {
     pub const NS_STYLE_WORDBREAK_KEEP_ALL: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_OVERFLOWWRAP_NORMAL: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_OVERFLOWWRAP_BREAK_WORD: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_HYPHENS_NONE: ::std::os::raw::c_uint = 0;
-    pub const NS_STYLE_HYPHENS_MANUAL: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_HYPHENS_AUTO: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_RUBY_ALIGN_START: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_RUBY_ALIGN_CENTER: ::std::os::raw::c_uint = 1;
     pub const NS_STYLE_RUBY_ALIGN_SPACE_BETWEEN: ::std::os::raw::c_uint = 2;
@@ -1367,9 +1356,6 @@ pub mod root {
             impl Clone for AudioContext {
                 fn clone(&self) -> Self { *self }
             }
-            pub const ReferrerPolicy_RP_Default:
-                      root::mozilla::dom::ReferrerPolicy =
-                ReferrerPolicy::RP_No_Referrer_When_Downgrade;
             #[repr(u32)]
             #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
             pub enum ReferrerPolicy {
@@ -2315,6 +2301,7 @@ pub mod root {
             pub mTitle: ::nsstring::nsStringRepr,
             pub mDocument: *mut root::nsIDocument,
             pub mOwningNode: *mut root::nsINode,
+            pub mMedia: root::RefPtr<root::nsMediaList>,
             pub mParsingMode: root::mozilla::css::SheetParsingMode,
             pub mType: root::StyleBackendType,
             pub mDisabled: bool,
@@ -2342,7 +2329,7 @@ pub mod root {
         }
         #[test]
         fn bindgen_test_layout_StyleSheet() {
-            assert_eq!(::std::mem::size_of::<StyleSheet>() , 80usize);
+            assert_eq!(::std::mem::size_of::<StyleSheet>() , 88usize);
             assert_eq!(::std::mem::align_of::<StyleSheet>() , 8usize);
         }
         #[repr(C)]
@@ -2361,6 +2348,18 @@ pub mod root {
             eSideBottom = 2,
             eSideLeft = 3,
         }
+        #[repr(u32)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum HalfCorner {
+            eCornerTopLeftX = 0,
+            eCornerTopLeftY = 1,
+            eCornerTopRightX = 2,
+            eCornerTopRightY = 3,
+            eCornerBottomRightX = 4,
+            eCornerBottomRightY = 5,
+            eCornerBottomLeftX = 6,
+            eCornerBottomLeftY = 7,
+        }
         #[repr(C)]
         #[derive(Debug, Copy)]
         pub struct SVGAttrAnimationRuleProcessor {
@@ -2740,6 +2739,9 @@ pub mod root {
         pub enum StyleFloatEdge { ContentBox = 0, MarginBox = 1, }
         #[repr(u8)]
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum StyleHyphens { None = 0, Manual = 1, Auto = 2, }
+        #[repr(u8)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub enum StyleShapeOutsideShapeBox {
             NoBox = 0,
             Content = 1,
@@ -3037,6 +3039,93 @@ pub mod root {
             assert_eq!(::std::mem::align_of::<root::mozilla::DefaultDelete<root::RawServoStyleSet>>()
                        , 1usize);
         }
+        #[repr(u8)]
+        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+        pub enum CSSPseudoClassType {
+            empty = 0,
+            mozOnlyWhitespace = 1,
+            mozEmptyExceptChildrenWithLocalname = 2,
+            lang = 3,
+            mozBoundElement = 4,
+            root = 5,
+            any = 6,
+            firstChild = 7,
+            firstNode = 8,
+            lastChild = 9,
+            lastNode = 10,
+            onlyChild = 11,
+            firstOfType = 12,
+            lastOfType = 13,
+            onlyOfType = 14,
+            nthChild = 15,
+            nthLastChild = 16,
+            nthOfType = 17,
+            nthLastOfType = 18,
+            mozIsHTML = 19,
+            unresolved = 20,
+            mozNativeAnonymous = 21,
+            mozSystemMetric = 22,
+            mozLocaleDir = 23,
+            mozLWTheme = 24,
+            mozLWThemeBrightText = 25,
+            mozLWThemeDarkText = 26,
+            mozWindowInactive = 27,
+            mozTableBorderNonzero = 28,
+            mozBrowserFrame = 29,
+            scope = 30,
+            negation = 31,
+            dir = 32,
+            link = 33,
+            mozAnyLink = 34,
+            anyLink = 35,
+            visited = 36,
+            active = 37,
+            checked = 38,
+            disabled = 39,
+            enabled = 40,
+            focus = 41,
+            focusWithin = 42,
+            hover = 43,
+            mozDragOver = 44,
+            target = 45,
+            indeterminate = 46,
+            mozDevtoolsHighlighted = 47,
+            mozStyleeditorTransitioning = 48,
+            fullscreen = 49,
+            mozFullScreen = 50,
+            mozFocusRing = 51,
+            mozBroken = 52,
+            mozLoading = 53,
+            mozUserDisabled = 54,
+            mozSuppressed = 55,
+            mozHandlerClickToPlay = 56,
+            mozHandlerVulnerableUpdatable = 57,
+            mozHandlerVulnerableNoUpdate = 58,
+            mozHandlerDisabled = 59,
+            mozHandlerBlocked = 60,
+            mozHandlerCrashed = 61,
+            mozMathIncrementScriptLevel = 62,
+            required = 63,
+            optional = 64,
+            valid = 65,
+            invalid = 66,
+            inRange = 67,
+            outOfRange = 68,
+            defaultPseudo = 69,
+            placeholderShown = 70,
+            mozReadOnly = 71,
+            mozReadWrite = 72,
+            mozSubmitInvalid = 73,
+            mozUIInvalid = 74,
+            mozUIValid = 75,
+            mozMeterOptimum = 76,
+            mozMeterSubOptimum = 77,
+            mozMeterSubSubOptimum = 78,
+            mozPlaceholder = 79,
+            Count = 80,
+            NotPseudo = 81,
+            MAX = 82,
+        }
         #[repr(C)]
         #[derive(Debug)]
         pub struct CSSVariableValues {
@@ -3070,23 +3159,6 @@ pub mod root {
             assert_eq!(::std::mem::size_of::<CSSVariableValues>() , 48usize);
             assert_eq!(::std::mem::align_of::<CSSVariableValues>() , 8usize);
         }
-        #[repr(C)]
-        pub struct CounterStyle__bindgen_vtable {
-        }
-        #[repr(C)]
-        #[derive(Debug, Copy)]
-        pub struct CounterStyle {
-            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 {
-            fn clone(&self) -> Self { *self }
-        }
         pub mod image {
             #[allow(unused_imports)]
             use self::super::super::super::root;
@@ -3144,6 +3216,23 @@ pub mod root {
             }
         }
         #[repr(C)]
+        pub struct CounterStyle__bindgen_vtable {
+        }
+        #[repr(C)]
+        #[derive(Debug, Copy)]
+        pub struct CounterStyle {
+            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 {
+            fn clone(&self) -> Self { *self }
+        }
+        #[repr(C)]
         #[derive(Debug, Copy)]
         pub struct Position {
             pub mXPosition: root::mozilla::Position_Coord,
@@ -3225,93 +3314,6 @@ pub mod root {
             root::mozilla::StyleShapeSource<root::mozilla::StyleGeometryBox>;
         pub type StyleShapeOutside =
             root::mozilla::StyleShapeSource<root::mozilla::StyleShapeOutsideShapeBox>;
-        #[repr(u8)]
-        #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-        pub enum CSSPseudoClassType {
-            empty = 0,
-            mozOnlyWhitespace = 1,
-            mozEmptyExceptChildrenWithLocalname = 2,
-            lang = 3,
-            mozBoundElement = 4,
-            root = 5,
-            any = 6,
-            firstChild = 7,
-            firstNode = 8,
-            lastChild = 9,
-            lastNode = 10,
-            onlyChild = 11,
-            firstOfType = 12,
-            lastOfType = 13,
-            onlyOfType = 14,
-            nthChild = 15,
-            nthLastChild = 16,
-            nthOfType = 17,
-            nthLastOfType = 18,
-            mozIsHTML = 19,
-            unresolved = 20,
-            mozNativeAnonymous = 21,
-            mozSystemMetric = 22,
-            mozLocaleDir = 23,
-            mozLWTheme = 24,
-            mozLWThemeBrightText = 25,
-            mozLWThemeDarkText = 26,
-            mozWindowInactive = 27,
-            mozTableBorderNonzero = 28,
-            mozBrowserFrame = 29,
-            scope = 30,
-            negation = 31,
-            dir = 32,
-            link = 33,
-            mozAnyLink = 34,
-            anyLink = 35,
-            visited = 36,
-            active = 37,
-            checked = 38,
-            disabled = 39,
-            enabled = 40,
-            focus = 41,
-            focusWithin = 42,
-            hover = 43,
-            mozDragOver = 44,
-            target = 45,
-            indeterminate = 46,
-            mozDevtoolsHighlighted = 47,
-            mozStyleeditorTransitioning = 48,
-            fullscreen = 49,
-            mozFullScreen = 50,
-            mozFocusRing = 51,
-            mozBroken = 52,
-            mozLoading = 53,
-            mozUserDisabled = 54,
-            mozSuppressed = 55,
-            mozHandlerClickToPlay = 56,
-            mozHandlerVulnerableUpdatable = 57,
-            mozHandlerVulnerableNoUpdate = 58,
-            mozHandlerDisabled = 59,
-            mozHandlerBlocked = 60,
-            mozHandlerCrashed = 61,
-            mozMathIncrementScriptLevel = 62,
-            required = 63,
-            optional = 64,
-            valid = 65,
-            invalid = 66,
-            inRange = 67,
-            outOfRange = 68,
-            defaultPseudo = 69,
-            placeholderShown = 70,
-            mozReadOnly = 71,
-            mozReadWrite = 72,
-            mozSubmitInvalid = 73,
-            mozUIInvalid = 74,
-            mozUIValid = 75,
-            mozMeterOptimum = 76,
-            mozMeterSubOptimum = 77,
-            mozMeterSubSubOptimum = 78,
-            mozPlaceholder = 79,
-            Count = 80,
-            NotPseudo = 81,
-            MAX = 82,
-        }
         #[test]
         fn __bindgen_test_layout_template_2() {
             assert_eq!(::std::mem::size_of::<root::mozilla::StyleShapeSource<root::mozilla::StyleGeometryBox>>()
@@ -4366,6 +4368,7 @@ pub mod root {
     pub struct nsCycleCollectionParticipant {
         pub vtable_: *const nsCycleCollectionParticipant__bindgen_vtable,
         pub mMightSkip: bool,
+        pub mTraverseShouldTrace: bool,
     }
     #[test]
     fn bindgen_test_layout_nsCycleCollectionParticipant() {
@@ -4831,8 +4834,7 @@ pub mod root {
    * 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_TRACE_PRESERVED_WRAPPER and
    * NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER).
    */
     #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -5033,7 +5035,7 @@ pub mod root {
         pub mStates: root::EventStates_InternalType,
     }
     pub type EventStates_InternalType = u64;
-    pub type EventStates_ServoType = u8;
+    pub type EventStates_ServoType = u16;
     #[test]
     fn bindgen_test_layout_EventStates() {
         assert_eq!(::std::mem::size_of::<EventStates>() , 8usize);
@@ -6504,6 +6506,12 @@ pub mod root {
         pub mFramesConstructed: u64,
         pub mFramesReflowed: u64,
         pub mReflowStartTime: root::mozilla::TimeStamp,
+        pub mFirstPaintTime: root::mozilla::TimeStamp,
+        pub mFirstClickTime: root::mozilla::TimeStamp,
+        pub mFirstKeyTime: root::mozilla::TimeStamp,
+        pub mFirstMouseMoveTime: root::mozilla::TimeStamp,
+        pub mFirstScrollTime: root::mozilla::TimeStamp,
+        pub mInteractionTimeEnabled: bool,
         pub mLastStyleUpdateForAllAnimations: root::mozilla::TimeStamp,
         pub _bitfield_1: u64,
     }
@@ -6537,6 +6545,14 @@ pub mod root {
         eContext_Print = 2,
         eContext_PageLayout = 3,
     }
+    #[repr(u32)]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+    pub enum nsPresContext_InteractionType {
+        eClickInteraction = 0,
+        eKeyInteraction = 1,
+        eMouseMoveInteraction = 2,
+        eScrollInteraction = 3,
+    }
     /**
    * A class that can be used to temporarily disable reflow interruption.
    */
@@ -6561,7 +6577,7 @@ pub mod root {
     }
     #[test]
     fn bindgen_test_layout_nsPresContext() {
-        assert_eq!(::std::mem::size_of::<nsPresContext>() , 1216usize);
+        assert_eq!(::std::mem::size_of::<nsPresContext>() , 1264usize);
         assert_eq!(::std::mem::align_of::<nsPresContext>() , 8usize);
     }
     impl nsPresContext {
@@ -7892,6 +7908,14 @@ pub mod root {
                                                        *mut ::std::os::raw::c_void)
                                   -> ::std::os::raw::c_int>;
     #[repr(C)]
+    #[derive(Debug, Copy)]
+    pub struct nsMediaList {
+        pub _address: u8,
+    }
+    impl Clone for nsMediaList {
+        fn clone(&self) -> Self { *self }
+    }
+    #[repr(C)]
     #[derive(Debug)]
     pub struct nsAttrValue {
         pub mBits: usize,
@@ -9157,10 +9181,6 @@ pub mod root {
     impl Clone for nsFrameManagerBase_UndisplayedMap {
         fn clone(&self) -> Self { *self }
     }
-    extern "C" {
-        #[link_name = "_ZN18nsFrameManagerBase23sGlobalGenerationNumberE"]
-        pub static mut nsFrameManagerBase_sGlobalGenerationNumber: u32;
-    }
     #[test]
     fn bindgen_test_layout_nsFrameManagerBase() {
         assert_eq!(::std::mem::size_of::<nsFrameManagerBase>() , 80usize);
@@ -11588,14 +11608,14 @@ pub mod root {
     pub type RawGeckoNode = root::nsINode;
     pub type RawGeckoElement = root::mozilla::dom::Element;
     pub type RawGeckoDocument = root::nsIDocument;
-    pub type RawGeckoPresContext = [u64; 152usize];
+    pub type RawGeckoPresContext = [u64; 158usize];
     pub type RawGeckoNodeBorrowed = *const root::RawGeckoNode;
     pub type RawGeckoNodeBorrowedOrNull = *const root::RawGeckoNode;
     pub type RawGeckoElementBorrowed = *const root::RawGeckoElement;
     pub type RawGeckoElementBorrowedOrNull = *const root::RawGeckoElement;
     pub type RawGeckoDocumentBorrowed = *const root::RawGeckoDocument;
     pub type RawGeckoDocumentBorrowedOrNull = *const root::RawGeckoDocument;
-    pub type RawGeckoPresContextBorrowed = *const [u64; 152usize];
+    pub type RawGeckoPresContextBorrowed = *const [u64; 158usize];
     #[repr(u32)]
     #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
     pub enum nsCSSTokenSerializationType {
@@ -11627,20 +11647,6 @@ pub mod root {
     }
     #[repr(C)]
     #[derive(Debug, Copy)]
-    pub struct LookAndFeelInt {
-        pub id: i32,
-        pub value: i32,
-    }
-    #[test]
-    fn bindgen_test_layout_LookAndFeelInt() {
-        assert_eq!(::std::mem::size_of::<LookAndFeelInt>() , 8usize);
-        assert_eq!(::std::mem::align_of::<LookAndFeelInt>() , 4usize);
-    }
-    impl Clone for LookAndFeelInt {
-        fn clone(&self) -> Self { *self }
-    }
-    #[repr(C)]
-    #[derive(Debug, Copy)]
     pub struct imgIContainer {
         pub _address: u8,
     }
@@ -12467,7 +12473,7 @@ pub mod root {
         pub mWhiteSpace: u8,
         pub mWordBreak: u8,
         pub mOverflowWrap: u8,
-        pub mHyphens: u8,
+        pub mHyphens: root::mozilla::StyleHyphens,
         pub mRubyAlign: u8,
         pub mRubyPosition: u8,
         pub mTextSizeAdjust: u8,
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index 56c8ce5cfc3..60bd2ddbdb4 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -596,10 +596,10 @@ class Side(object):
         self.index = index
 
 class Corner(object):
-    def __init__(self, name, index):
-        self.x_name = "NS_CORNER_" + name + "_X"
-        self.y_name = "NS_CORNER_" + name + "_Y"
-        self.ident = name.lower()
+    def __init__(self, vert, horiz, index):
+        self.x_name = "HalfCorner::eCorner" + vert + horiz + "X"
+        self.y_name = "HalfCorner::eCorner" + vert + horiz + "Y"
+        self.ident = (vert + "_" + horiz).lower()
         self.x_index = 2 * index
         self.y_index = 2 * index + 1
 
@@ -610,7 +610,8 @@ class GridLine(object):
         self.gecko = "m" + to_camel_case(self.ident)
 
 SIDES = [Side("Top", 0), Side("Right", 1), Side("Bottom", 2), Side("Left", 3)]
-CORNERS = [Corner("TOP_LEFT", 0), Corner("TOP_RIGHT", 1), Corner("BOTTOM_RIGHT", 2), Corner("BOTTOM_LEFT", 3)]
+CORNERS = [Corner("Top", "Left", 0), Corner("Top", "Right", 1),
+           Corner("Bottom", "Right", 2), Corner("Bottom", "Left", 3)]
 GRID_LINES = map(GridLine, ["row-start", "row-end", "column-start", "column-end"])
 %>
 
diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhand/inherited_text.mako.rs
index e40d8e31e3f..7e5881ee8db 100644
--- a/components/style/properties/longhand/inherited_text.mako.rs
+++ b/components/style/properties/longhand/inherited_text.mako.rs
@@ -155,6 +155,7 @@ ${helpers.single_keyword("text-transform",
                          spec="https://drafts.csswg.org/css-text/#propdef-text-transform")}
 
 ${helpers.single_keyword("hyphens", "none manual auto",
+                         gecko_enum_prefix="StyleHyphens",
                          products="gecko", animatable=False,
                          spec="https://drafts.csswg.org/css-text/#propdef-hyphens")}