From a6afaf2428b21184ace1f45a60d292354b4bffe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Fri, 16 Feb 2018 13:09:10 +0100 Subject: [PATCH] style: Update bindings. --- .../style/gecko/generated/atom_macro.rs | 136 +++ components/style/gecko/generated/bindings.rs | 187 ++-- .../generated/pseudo_element_definition.rs | 2 +- components/style/gecko/generated/structs.rs | 795 +++++++----------- ports/geckolib/glue.rs | 4 +- 5 files changed, 591 insertions(+), 533 deletions(-) diff --git a/components/style/gecko/generated/atom_macro.rs b/components/style/gecko/generated/atom_macro.rs index e620ce3c4c9..4b9be1c074e 100644 --- a/components/style/gecko/generated/atom_macro.rs +++ b/components/style/gecko/generated/atom_macro.rs @@ -884,6 +884,8 @@ cfg_if! { pub static nsGkAtoms_figcaption: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms6figureE"] pub static nsGkAtoms_figure: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms7findbarE"] + pub static nsGkAtoms_findbar: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms5fixedE"] pub static nsGkAtoms_fixed: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms5flagsE"] @@ -964,12 +966,20 @@ cfg_if! { pub static nsGkAtoms_glyphchar: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms7glyphidE"] pub static nsGkAtoms_glyphid: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms16graphicsDocumentE"] + pub static nsGkAtoms_graphicsDocument: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms14graphicsObjectE"] + pub static nsGkAtoms_graphicsObject: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms14graphicsSymbolE"] + pub static nsGkAtoms_graphicsSymbol: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms4gridE"] pub static nsGkAtoms_grid: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms6grippyE"] pub static nsGkAtoms_grippy: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms5groupE"] pub static nsGkAtoms_group: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms8groupboxE"] + pub static nsGkAtoms_groupbox: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms17groupingSeparatorE"] pub static nsGkAtoms_groupingSeparator: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms12groupingSizeE"] @@ -1328,6 +1338,8 @@ cfg_if! { pub static nsGkAtoms_menubutton: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms10menuButtonE"] pub static nsGkAtoms_menuButton: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms11menucaptionE"] + pub static nsGkAtoms_menucaption: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms9menugroupE"] pub static nsGkAtoms_menugroup: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms8menuitemE"] @@ -1482,6 +1494,8 @@ cfg_if! { pub static nsGkAtoms_noscript: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms7noshadeE"] pub static nsGkAtoms_noshade: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms12notificationE"] + pub static nsGkAtoms_notification: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms10novalidateE"] pub static nsGkAtoms_novalidate: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms4_notE"] @@ -4418,6 +4432,26 @@ cfg_if! { pub static nsGkAtoms_windows_theme_zune: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms21windows_theme_genericE"] pub static nsGkAtoms_windows_theme_generic: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms4aeroE"] + pub static nsGkAtoms_aero: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms9aero_liteE"] + pub static nsGkAtoms_aero_lite: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms9luna_blueE"] + pub static nsGkAtoms_luna_blue: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms10luna_oliveE"] + pub static nsGkAtoms_luna_olive: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms11luna_silverE"] + pub static nsGkAtoms_luna_silver: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms6royaleE"] + pub static nsGkAtoms_royale: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms4zuneE"] + pub static nsGkAtoms_zune: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms12windows_win7E"] + pub static nsGkAtoms_windows_win7: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms12windows_win8E"] + pub static nsGkAtoms_windows_win8: *mut nsStaticAtom; + #[link_name = "_ZN9nsGkAtoms13windows_win10E"] + pub static nsGkAtoms_windows_win10: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms29_moz_scrollbar_start_backwardE"] pub static nsGkAtoms__moz_scrollbar_start_backward: *mut nsStaticAtom; #[link_name = "_ZN9nsGkAtoms28_moz_scrollbar_start_forwardE"] @@ -6055,6 +6089,8 @@ cfg_if! { pub static nsGkAtoms_figcaption: *mut nsStaticAtom; #[link_name = "?figure@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_figure: *mut nsStaticAtom; + #[link_name = "?findbar@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_findbar: *mut nsStaticAtom; #[link_name = "?fixed@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_fixed: *mut nsStaticAtom; #[link_name = "?flags@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] @@ -6135,12 +6171,20 @@ cfg_if! { pub static nsGkAtoms_glyphchar: *mut nsStaticAtom; #[link_name = "?glyphid@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_glyphid: *mut nsStaticAtom; + #[link_name = "?graphicsDocument@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_graphicsDocument: *mut nsStaticAtom; + #[link_name = "?graphicsObject@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_graphicsObject: *mut nsStaticAtom; + #[link_name = "?graphicsSymbol@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_graphicsSymbol: *mut nsStaticAtom; #[link_name = "?grid@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_grid: *mut nsStaticAtom; #[link_name = "?grippy@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_grippy: *mut nsStaticAtom; #[link_name = "?group@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_group: *mut nsStaticAtom; + #[link_name = "?groupbox@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_groupbox: *mut nsStaticAtom; #[link_name = "?groupingSeparator@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_groupingSeparator: *mut nsStaticAtom; #[link_name = "?groupingSize@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] @@ -6499,6 +6543,8 @@ cfg_if! { pub static nsGkAtoms_menubutton: *mut nsStaticAtom; #[link_name = "?menuButton@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_menuButton: *mut nsStaticAtom; + #[link_name = "?menucaption@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_menucaption: *mut nsStaticAtom; #[link_name = "?menugroup@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_menugroup: *mut nsStaticAtom; #[link_name = "?menuitem@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] @@ -6653,6 +6699,8 @@ cfg_if! { pub static nsGkAtoms_noscript: *mut nsStaticAtom; #[link_name = "?noshade@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_noshade: *mut nsStaticAtom; + #[link_name = "?notification@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_notification: *mut nsStaticAtom; #[link_name = "?novalidate@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_novalidate: *mut nsStaticAtom; #[link_name = "?_not@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] @@ -9589,6 +9637,26 @@ cfg_if! { pub static nsGkAtoms_windows_theme_zune: *mut nsStaticAtom; #[link_name = "?windows_theme_generic@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms_windows_theme_generic: *mut nsStaticAtom; + #[link_name = "?aero@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_aero: *mut nsStaticAtom; + #[link_name = "?aero_lite@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_aero_lite: *mut nsStaticAtom; + #[link_name = "?luna_blue@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_luna_blue: *mut nsStaticAtom; + #[link_name = "?luna_olive@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_luna_olive: *mut nsStaticAtom; + #[link_name = "?luna_silver@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_luna_silver: *mut nsStaticAtom; + #[link_name = "?royale@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_royale: *mut nsStaticAtom; + #[link_name = "?zune@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_zune: *mut nsStaticAtom; + #[link_name = "?windows_win7@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_windows_win7: *mut nsStaticAtom; + #[link_name = "?windows_win8@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_windows_win8: *mut nsStaticAtom; + #[link_name = "?windows_win10@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] + pub static nsGkAtoms_windows_win10: *mut nsStaticAtom; #[link_name = "?_moz_scrollbar_start_backward@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] pub static nsGkAtoms__moz_scrollbar_start_backward: *mut nsStaticAtom; #[link_name = "?_moz_scrollbar_start_forward@nsGkAtoms@@2PEAVnsStaticAtom@@EA"] @@ -11226,6 +11294,8 @@ cfg_if! { pub static nsGkAtoms_figcaption: *mut nsStaticAtom; #[link_name = "\x01?figure@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_figure: *mut nsStaticAtom; + #[link_name = "\x01?findbar@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_findbar: *mut nsStaticAtom; #[link_name = "\x01?fixed@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_fixed: *mut nsStaticAtom; #[link_name = "\x01?flags@nsGkAtoms@@2PAVnsStaticAtom@@A"] @@ -11306,12 +11376,20 @@ cfg_if! { pub static nsGkAtoms_glyphchar: *mut nsStaticAtom; #[link_name = "\x01?glyphid@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_glyphid: *mut nsStaticAtom; + #[link_name = "\x01?graphicsDocument@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_graphicsDocument: *mut nsStaticAtom; + #[link_name = "\x01?graphicsObject@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_graphicsObject: *mut nsStaticAtom; + #[link_name = "\x01?graphicsSymbol@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_graphicsSymbol: *mut nsStaticAtom; #[link_name = "\x01?grid@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_grid: *mut nsStaticAtom; #[link_name = "\x01?grippy@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_grippy: *mut nsStaticAtom; #[link_name = "\x01?group@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_group: *mut nsStaticAtom; + #[link_name = "\x01?groupbox@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_groupbox: *mut nsStaticAtom; #[link_name = "\x01?groupingSeparator@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_groupingSeparator: *mut nsStaticAtom; #[link_name = "\x01?groupingSize@nsGkAtoms@@2PAVnsStaticAtom@@A"] @@ -11670,6 +11748,8 @@ cfg_if! { pub static nsGkAtoms_menubutton: *mut nsStaticAtom; #[link_name = "\x01?menuButton@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_menuButton: *mut nsStaticAtom; + #[link_name = "\x01?menucaption@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_menucaption: *mut nsStaticAtom; #[link_name = "\x01?menugroup@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_menugroup: *mut nsStaticAtom; #[link_name = "\x01?menuitem@nsGkAtoms@@2PAVnsStaticAtom@@A"] @@ -11824,6 +11904,8 @@ cfg_if! { pub static nsGkAtoms_noscript: *mut nsStaticAtom; #[link_name = "\x01?noshade@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_noshade: *mut nsStaticAtom; + #[link_name = "\x01?notification@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_notification: *mut nsStaticAtom; #[link_name = "\x01?novalidate@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_novalidate: *mut nsStaticAtom; #[link_name = "\x01?_not@nsGkAtoms@@2PAVnsStaticAtom@@A"] @@ -14760,6 +14842,26 @@ cfg_if! { pub static nsGkAtoms_windows_theme_zune: *mut nsStaticAtom; #[link_name = "\x01?windows_theme_generic@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms_windows_theme_generic: *mut nsStaticAtom; + #[link_name = "\x01?aero@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_aero: *mut nsStaticAtom; + #[link_name = "\x01?aero_lite@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_aero_lite: *mut nsStaticAtom; + #[link_name = "\x01?luna_blue@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_luna_blue: *mut nsStaticAtom; + #[link_name = "\x01?luna_olive@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_luna_olive: *mut nsStaticAtom; + #[link_name = "\x01?luna_silver@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_luna_silver: *mut nsStaticAtom; + #[link_name = "\x01?royale@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_royale: *mut nsStaticAtom; + #[link_name = "\x01?zune@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_zune: *mut nsStaticAtom; + #[link_name = "\x01?windows_win7@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_windows_win7: *mut nsStaticAtom; + #[link_name = "\x01?windows_win8@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_windows_win8: *mut nsStaticAtom; + #[link_name = "\x01?windows_win10@nsGkAtoms@@2PAVnsStaticAtom@@A"] + pub static nsGkAtoms_windows_win10: *mut nsStaticAtom; #[link_name = "\x01?_moz_scrollbar_start_backward@nsGkAtoms@@2PAVnsStaticAtom@@A"] pub static nsGkAtoms__moz_scrollbar_start_backward: *mut nsStaticAtom; #[link_name = "\x01?_moz_scrollbar_start_forward@nsGkAtoms@@2PAVnsStaticAtom@@A"] @@ -16400,6 +16502,8 @@ macro_rules! atom { {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_figcaption as *mut _) } }}; ("figure") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_figure as *mut _) } }}; +("findbar") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_findbar as *mut _) } }}; ("fixed") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_fixed as *mut _) } }}; ("flags") => @@ -16480,12 +16584,20 @@ macro_rules! atom { {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_glyphchar as *mut _) } }}; ("glyphid") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_glyphid as *mut _) } }}; +("graphics-document") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_graphicsDocument as *mut _) } }}; +("graphics-object") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_graphicsObject as *mut _) } }}; +("graphics-symbol") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_graphicsSymbol as *mut _) } }}; ("grid") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_grid as *mut _) } }}; ("grippy") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_grippy as *mut _) } }}; ("group") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_group as *mut _) } }}; +("groupbox") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_groupbox as *mut _) } }}; ("grouping-separator") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_groupingSeparator as *mut _) } }}; ("grouping-size") => @@ -16844,6 +16956,8 @@ macro_rules! atom { {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_menubutton as *mut _) } }}; ("menu-button") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_menuButton as *mut _) } }}; +("menucaption") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_menucaption as *mut _) } }}; ("menugroup") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_menugroup as *mut _) } }}; ("menuitem") => @@ -16998,6 +17112,8 @@ macro_rules! atom { {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_noscript as *mut _) } }}; ("noshade") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_noshade as *mut _) } }}; +("notification") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_notification as *mut _) } }}; ("novalidate") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_novalidate as *mut _) } }}; ("not") => @@ -19934,6 +20050,26 @@ macro_rules! atom { {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_theme_zune as *mut _) } }}; ("windows-theme-generic") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_theme_generic as *mut _) } }}; +("aero") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_aero as *mut _) } }}; +("aero-lite") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_aero_lite as *mut _) } }}; +("luna-blue") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_luna_blue as *mut _) } }}; +("luna-olive") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_luna_olive as *mut _) } }}; +("luna-silver") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_luna_silver as *mut _) } }}; +("royale") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_royale as *mut _) } }}; +("zune") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_zune as *mut _) } }}; +("windows-win7") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_win7 as *mut _) } }}; +("windows-win8") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_win8 as *mut _) } }}; +("windows-win10") => + {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_windows_win10 as *mut _) } }}; ("-moz-scrollbar-start-backward") => {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms__moz_scrollbar_start_backward as *mut _) } }}; ("-moz-scrollbar-start-forward") => diff --git a/components/style/gecko/generated/bindings.rs b/components/style/gecko/generated/bindings.rs index 2423a0e29a5..ee634a5f333 100644 --- a/components/style/gecko/generated/bindings.rs +++ b/components/style/gecko/generated/bindings.rs @@ -18,7 +18,6 @@ use gecko_bindings::structs::mozilla::dom::CallerType; use gecko_bindings::structs::mozilla::AnonymousCounterStyle; use gecko_bindings::structs::mozilla::AtomArray; use gecko_bindings::structs::mozilla::MallocSizeOf; -use gecko_bindings::structs::mozilla::ServoStyleSet; use gecko_bindings::structs::mozilla::OriginFlags; use gecko_bindings::structs::mozilla::UniquePtr; use gecko_bindings::structs::ServoRawOffsetArc; @@ -255,38 +254,60 @@ use gecko_bindings::structs::FontFamilyName; use gecko_bindings::structs::mozilla::SharedFontList; pub type nsTArrayBorrowed_uintptr_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray; pub type RawServoStyleSetOwned = ::gecko_bindings::sugar::ownership::Owned; -pub type RawServoStyleSetOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type RawServoStyleSetOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type RawServoStyleSetBorrowed<'a> = &'a RawServoStyleSet; pub type RawServoStyleSetBorrowedOrNull<'a> = Option<&'a RawServoStyleSet>; pub type RawServoStyleSetBorrowedMut<'a> = &'a mut RawServoStyleSet; pub type RawServoStyleSetBorrowedMutOrNull<'a> = Option<&'a mut RawServoStyleSet>; -enum RawServoStyleSetVoid { } +enum RawServoStyleSetVoid { +} pub struct RawServoStyleSet(RawServoStyleSetVoid); -pub type RawServoSelectorListOwned = ::gecko_bindings::sugar::ownership::Owned; -pub type RawServoSelectorListOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type RawServoAuthorStylesOwned = + ::gecko_bindings::sugar::ownership::Owned; +pub type RawServoAuthorStylesOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type RawServoAuthorStylesBorrowed<'a> = &'a RawServoAuthorStyles; +pub type RawServoAuthorStylesBorrowedOrNull<'a> = Option<&'a RawServoAuthorStyles>; +pub type RawServoAuthorStylesBorrowedMut<'a> = &'a mut RawServoAuthorStyles; +pub type RawServoAuthorStylesBorrowedMutOrNull<'a> = Option<&'a mut RawServoAuthorStyles>; +enum RawServoAuthorStylesVoid { +} +pub struct RawServoAuthorStyles(RawServoAuthorStylesVoid); +pub type RawServoSelectorListOwned = + ::gecko_bindings::sugar::ownership::Owned; +pub type RawServoSelectorListOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type RawServoSelectorListBorrowed<'a> = &'a RawServoSelectorList; pub type RawServoSelectorListBorrowedOrNull<'a> = Option<&'a RawServoSelectorList>; pub type RawServoSelectorListBorrowedMut<'a> = &'a mut RawServoSelectorList; pub type RawServoSelectorListBorrowedMutOrNull<'a> = Option<&'a mut RawServoSelectorList>; -pub type RawServoSourceSizeListOwned = ::gecko_bindings::sugar::ownership::Owned; -pub type RawServoSourceSizeListOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type RawServoSourceSizeListOwned = + ::gecko_bindings::sugar::ownership::Owned; +pub type RawServoSourceSizeListOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type RawServoSourceSizeListBorrowed<'a> = &'a RawServoSourceSizeList; pub type RawServoSourceSizeListBorrowedOrNull<'a> = Option<&'a RawServoSourceSizeList>; pub type RawServoSourceSizeListBorrowedMut<'a> = &'a mut RawServoSourceSizeList; pub type RawServoSourceSizeListBorrowedMutOrNull<'a> = Option<&'a mut RawServoSourceSizeList>; -pub type ServoElementSnapshotOwned = ::gecko_bindings::sugar::ownership::Owned; -pub type ServoElementSnapshotOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type ServoElementSnapshotOwned = + ::gecko_bindings::sugar::ownership::Owned; +pub type ServoElementSnapshotOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type ServoElementSnapshotBorrowed<'a> = &'a ServoElementSnapshot; pub type ServoElementSnapshotBorrowedOrNull<'a> = Option<&'a ServoElementSnapshot>; pub type ServoElementSnapshotBorrowedMut<'a> = &'a mut ServoElementSnapshot; pub type ServoElementSnapshotBorrowedMutOrNull<'a> = Option<&'a mut ServoElementSnapshot>; -pub type RawServoAnimationValueMapOwned = ::gecko_bindings::sugar::ownership::Owned; -pub type RawServoAnimationValueMapOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull; +pub type RawServoAnimationValueMapOwned = + ::gecko_bindings::sugar::ownership::Owned; +pub type RawServoAnimationValueMapOwnedOrNull = + ::gecko_bindings::sugar::ownership::OwnedOrNull; pub type RawServoAnimationValueMapBorrowed<'a> = &'a RawServoAnimationValueMap; pub type RawServoAnimationValueMapBorrowedOrNull<'a> = Option<&'a RawServoAnimationValueMap>; pub type RawServoAnimationValueMapBorrowedMut<'a> = &'a mut RawServoAnimationValueMap; pub type RawServoAnimationValueMapBorrowedMutOrNull<'a> = Option<&'a mut RawServoAnimationValueMap>; -enum RawServoAnimationValueMapVoid { } +enum RawServoAnimationValueMapVoid { +} pub struct RawServoAnimationValueMap(RawServoAnimationValueMapVoid); pub type RawGeckoNodeBorrowed<'a> = &'a RawGeckoNode; pub type RawGeckoNodeBorrowedOrNull<'a> = Option<&'a RawGeckoNode>; @@ -295,7 +316,8 @@ pub type RawGeckoElementBorrowedOrNull<'a> = Option<&'a RawGeckoElement>; pub type RawGeckoDocumentBorrowed<'a> = &'a RawGeckoDocument; pub type RawGeckoDocumentBorrowedOrNull<'a> = Option<&'a RawGeckoDocument>; pub type RawServoDeclarationBlockStrongBorrowed<'a> = &'a RawServoDeclarationBlockStrong; -pub type RawServoDeclarationBlockStrongBorrowedOrNull<'a> = Option<&'a RawServoDeclarationBlockStrong>; +pub type RawServoDeclarationBlockStrongBorrowedOrNull<'a> = + Option<&'a RawServoDeclarationBlockStrong>; pub type RawGeckoPresContextBorrowed<'a> = &'a RawGeckoPresContext; pub type RawGeckoPresContextBorrowedOrNull<'a> = Option<&'a RawGeckoPresContext>; pub type RawGeckoXBLBindingBorrowed<'a> = &'a RawGeckoXBLBinding; @@ -313,9 +335,11 @@ pub type nsTimingFunctionBorrowedOrNull<'a> = Option<&'a nsTimingFunction>; pub type nsTimingFunctionBorrowedMut<'a> = &'a mut nsTimingFunction; pub type nsTimingFunctionBorrowedMutOrNull<'a> = Option<&'a mut nsTimingFunction>; pub type RawGeckoAnimationPropertySegmentBorrowed<'a> = &'a RawGeckoAnimationPropertySegment; -pub type RawGeckoAnimationPropertySegmentBorrowedOrNull<'a> = Option<&'a RawGeckoAnimationPropertySegment>; +pub type RawGeckoAnimationPropertySegmentBorrowedOrNull<'a> = + Option<&'a RawGeckoAnimationPropertySegment>; pub type RawGeckoAnimationPropertySegmentBorrowedMut<'a> = &'a mut RawGeckoAnimationPropertySegment; -pub type RawGeckoAnimationPropertySegmentBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoAnimationPropertySegment>; +pub type RawGeckoAnimationPropertySegmentBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoAnimationPropertySegment>; pub type RawGeckoComputedTimingBorrowed<'a> = &'a RawGeckoComputedTiming; pub type RawGeckoComputedTimingBorrowedOrNull<'a> = Option<&'a RawGeckoComputedTiming>; pub type RawGeckoComputedTimingBorrowedMut<'a> = &'a mut RawGeckoComputedTiming; @@ -329,13 +353,18 @@ pub type RawGeckoKeyframeListBorrowedOrNull<'a> = Option<&'a RawGeckoKeyframeLis pub type RawGeckoKeyframeListBorrowedMut<'a> = &'a mut RawGeckoKeyframeList; pub type RawGeckoKeyframeListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoKeyframeList>; pub type RawGeckoPropertyValuePairListBorrowed<'a> = &'a RawGeckoPropertyValuePairList; -pub type RawGeckoPropertyValuePairListBorrowedOrNull<'a> = Option<&'a RawGeckoPropertyValuePairList>; +pub type RawGeckoPropertyValuePairListBorrowedOrNull<'a> = + Option<&'a RawGeckoPropertyValuePairList>; pub type RawGeckoPropertyValuePairListBorrowedMut<'a> = &'a mut RawGeckoPropertyValuePairList; -pub type RawGeckoPropertyValuePairListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoPropertyValuePairList>; +pub type RawGeckoPropertyValuePairListBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoPropertyValuePairList>; pub type RawGeckoComputedKeyframeValuesListBorrowed<'a> = &'a RawGeckoComputedKeyframeValuesList; -pub type RawGeckoComputedKeyframeValuesListBorrowedOrNull<'a> = Option<&'a RawGeckoComputedKeyframeValuesList>; -pub type RawGeckoComputedKeyframeValuesListBorrowedMut<'a> = &'a mut RawGeckoComputedKeyframeValuesList; -pub type RawGeckoComputedKeyframeValuesListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoComputedKeyframeValuesList>; +pub type RawGeckoComputedKeyframeValuesListBorrowedOrNull<'a> = + Option<&'a RawGeckoComputedKeyframeValuesList>; +pub type RawGeckoComputedKeyframeValuesListBorrowedMut<'a> = + &'a mut RawGeckoComputedKeyframeValuesList; +pub type RawGeckoComputedKeyframeValuesListBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoComputedKeyframeValuesList>; pub type RawGeckoFontFaceRuleListBorrowed<'a> = &'a RawGeckoFontFaceRuleList; pub type RawGeckoFontFaceRuleListBorrowedOrNull<'a> = Option<&'a RawGeckoFontFaceRuleList>; pub type RawGeckoFontFaceRuleListBorrowedMut<'a> = &'a mut RawGeckoFontFaceRuleList; @@ -343,28 +372,37 @@ pub type RawGeckoFontFaceRuleListBorrowedMutOrNull<'a> = Option<&'a mut RawGecko pub type RawGeckoServoStyleRuleListBorrowed<'a> = &'a RawGeckoServoStyleRuleList; pub type RawGeckoServoStyleRuleListBorrowedOrNull<'a> = Option<&'a RawGeckoServoStyleRuleList>; pub type RawGeckoServoStyleRuleListBorrowedMut<'a> = &'a mut RawGeckoServoStyleRuleList; -pub type RawGeckoServoStyleRuleListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoStyleRuleList>; +pub type RawGeckoServoStyleRuleListBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoServoStyleRuleList>; pub type RawGeckoServoAnimationValueListBorrowed<'a> = &'a RawGeckoServoAnimationValueList; -pub type RawGeckoServoAnimationValueListBorrowedOrNull<'a> = Option<&'a RawGeckoServoAnimationValueList>; +pub type RawGeckoServoAnimationValueListBorrowedOrNull<'a> = + Option<&'a RawGeckoServoAnimationValueList>; pub type RawGeckoServoAnimationValueListBorrowedMut<'a> = &'a mut RawGeckoServoAnimationValueList; -pub type RawGeckoServoAnimationValueListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoAnimationValueList>; +pub type RawGeckoServoAnimationValueListBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoServoAnimationValueList>; pub type RawGeckoStyleAnimationListBorrowed<'a> = &'a RawGeckoStyleAnimationList; pub type RawGeckoStyleAnimationListBorrowedOrNull<'a> = Option<&'a RawGeckoStyleAnimationList>; pub type RawGeckoStyleAnimationListBorrowedMut<'a> = &'a mut RawGeckoStyleAnimationList; -pub type RawGeckoStyleAnimationListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoStyleAnimationList>; +pub type RawGeckoStyleAnimationListBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoStyleAnimationList>; pub type RawGeckoStyleChildrenIteratorBorrowed<'a> = &'a RawGeckoStyleChildrenIterator; -pub type RawGeckoStyleChildrenIteratorBorrowedOrNull<'a> = Option<&'a RawGeckoStyleChildrenIterator>; +pub type RawGeckoStyleChildrenIteratorBorrowedOrNull<'a> = + Option<&'a RawGeckoStyleChildrenIterator>; pub type RawGeckoStyleChildrenIteratorBorrowedMut<'a> = &'a mut RawGeckoStyleChildrenIterator; -pub type RawGeckoStyleChildrenIteratorBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoStyleChildrenIterator>; +pub type RawGeckoStyleChildrenIteratorBorrowedMutOrNull<'a> = + Option<&'a mut RawGeckoStyleChildrenIterator>; pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong; pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules; pub type ServoCssRulesBorrowedOrNull<'a> = Option<&'a ServoCssRules>; -enum ServoCssRulesVoid { } +enum ServoCssRulesVoid { +} pub struct ServoCssRules(ServoCssRulesVoid); -pub type RawServoStyleSheetContentsStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoStyleSheetContentsStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoStyleSheetContentsBorrowed<'a> = &'a RawServoStyleSheetContents; pub type RawServoStyleSheetContentsBorrowedOrNull<'a> = Option<&'a RawServoStyleSheetContents>; -pub type RawServoDeclarationBlockStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoDeclarationBlockStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoDeclarationBlockBorrowed<'a> = &'a RawServoDeclarationBlock; pub type RawServoDeclarationBlockBorrowedOrNull<'a> = Option<&'a RawServoDeclarationBlock>; pub type RawServoStyleRuleStrong = ::gecko_bindings::sugar::ownership::Strong; @@ -373,20 +411,25 @@ pub type RawServoStyleRuleBorrowedOrNull<'a> = Option<&'a RawServoStyleRule>; pub type RawServoImportRuleStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoImportRuleBorrowed<'a> = &'a RawServoImportRule; pub type RawServoImportRuleBorrowedOrNull<'a> = Option<&'a RawServoImportRule>; -enum RawServoImportRuleVoid { } +enum RawServoImportRuleVoid { +} pub struct RawServoImportRule(RawServoImportRuleVoid); -pub type RawServoAnimationValueStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoAnimationValueStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoAnimationValueBorrowed<'a> = &'a RawServoAnimationValue; pub type RawServoAnimationValueBorrowedOrNull<'a> = Option<&'a RawServoAnimationValue>; pub type RawServoKeyframeStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoKeyframeBorrowed<'a> = &'a RawServoKeyframe; pub type RawServoKeyframeBorrowedOrNull<'a> = Option<&'a RawServoKeyframe>; -enum RawServoKeyframeVoid { } +enum RawServoKeyframeVoid { +} pub struct RawServoKeyframe(RawServoKeyframeVoid); -pub type RawServoKeyframesRuleStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoKeyframesRuleStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoKeyframesRuleBorrowed<'a> = &'a RawServoKeyframesRule; pub type RawServoKeyframesRuleBorrowedOrNull<'a> = Option<&'a RawServoKeyframesRule>; -enum RawServoKeyframesRuleVoid { } +enum RawServoKeyframesRuleVoid { +} pub struct RawServoKeyframesRule(RawServoKeyframesRuleVoid); pub type RawServoMediaListStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoMediaListBorrowed<'a> = &'a RawServoMediaList; @@ -394,37 +437,49 @@ pub type RawServoMediaListBorrowedOrNull<'a> = Option<&'a RawServoMediaList>; pub type RawServoMediaRuleStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoMediaRuleBorrowed<'a> = &'a RawServoMediaRule; pub type RawServoMediaRuleBorrowedOrNull<'a> = Option<&'a RawServoMediaRule>; -enum RawServoMediaRuleVoid { } +enum RawServoMediaRuleVoid { +} pub struct RawServoMediaRule(RawServoMediaRuleVoid); -pub type RawServoNamespaceRuleStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoNamespaceRuleStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoNamespaceRuleBorrowed<'a> = &'a RawServoNamespaceRule; pub type RawServoNamespaceRuleBorrowedOrNull<'a> = Option<&'a RawServoNamespaceRule>; -enum RawServoNamespaceRuleVoid { } +enum RawServoNamespaceRuleVoid { +} pub struct RawServoNamespaceRule(RawServoNamespaceRuleVoid); pub type RawServoPageRuleStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoPageRuleBorrowed<'a> = &'a RawServoPageRule; pub type RawServoPageRuleBorrowedOrNull<'a> = Option<&'a RawServoPageRule>; -enum RawServoPageRuleVoid { } +enum RawServoPageRuleVoid { +} pub struct RawServoPageRule(RawServoPageRuleVoid); -pub type RawServoSupportsRuleStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoSupportsRuleStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoSupportsRuleBorrowed<'a> = &'a RawServoSupportsRule; pub type RawServoSupportsRuleBorrowedOrNull<'a> = Option<&'a RawServoSupportsRule>; -enum RawServoSupportsRuleVoid { } +enum RawServoSupportsRuleVoid { +} pub struct RawServoSupportsRule(RawServoSupportsRuleVoid); -pub type RawServoDocumentRuleStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoDocumentRuleStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoDocumentRuleBorrowed<'a> = &'a RawServoDocumentRule; pub type RawServoDocumentRuleBorrowedOrNull<'a> = Option<&'a RawServoDocumentRule>; -enum RawServoDocumentRuleVoid { } +enum RawServoDocumentRuleVoid { +} pub struct RawServoDocumentRule(RawServoDocumentRuleVoid); -pub type RawServoFontFeatureValuesRuleStrong = ::gecko_bindings::sugar::ownership::Strong; +pub type RawServoFontFeatureValuesRuleStrong = + ::gecko_bindings::sugar::ownership::Strong; pub type RawServoFontFeatureValuesRuleBorrowed<'a> = &'a RawServoFontFeatureValuesRule; -pub type RawServoFontFeatureValuesRuleBorrowedOrNull<'a> = Option<&'a RawServoFontFeatureValuesRule>; -enum RawServoFontFeatureValuesRuleVoid { } +pub type RawServoFontFeatureValuesRuleBorrowedOrNull<'a> = + Option<&'a RawServoFontFeatureValuesRule>; +enum RawServoFontFeatureValuesRuleVoid { +} pub struct RawServoFontFeatureValuesRule(RawServoFontFeatureValuesRuleVoid); pub type RawServoRuleNodeStrong = ::gecko_bindings::sugar::ownership::Strong; pub type RawServoRuleNodeBorrowed<'a> = &'a RawServoRuleNode; pub type RawServoRuleNodeBorrowedOrNull<'a> = Option<&'a RawServoRuleNode>; -enum RawServoRuleNodeVoid { } +enum RawServoRuleNodeVoid { +} pub struct RawServoRuleNode(RawServoRuleNodeVoid); extern "C" { @@ -540,12 +595,25 @@ extern "C" { extern "C" { pub fn Servo_StyleSet_Drop(ptr: RawServoStyleSetOwned); } +extern "C" { + pub fn Servo_AuthorStyles_Drop(ptr: RawServoAuthorStylesOwned); +} extern "C" { pub fn Servo_SelectorList_Drop(ptr: RawServoSelectorListOwned); } extern "C" { pub fn Servo_SourceSizeList_Drop(ptr: RawServoSourceSizeListOwned); } +extern "C" { + pub fn Gecko_RecordTraversalStatistics( + total: u32, + parallel: u32, + total_t: u32, + parallel_t: u32, + total_s: u32, + parallel_s: u32, + ); +} extern "C" { pub fn Gecko_IsSignificantChild( node: RawGeckoNodeBorrowed, @@ -1538,9 +1606,9 @@ extern "C" { ) -> RawGeckoXBLBindingBorrowedOrNull; } extern "C" { - pub fn Gecko_XBLBinding_GetRawServoStyleSet( + pub fn Gecko_XBLBinding_GetRawServoStyles( aXBLBinding: RawGeckoXBLBindingBorrowed, - ) -> RawServoStyleSetBorrowedOrNull; + ) -> RawServoAuthorStylesBorrowedOrNull; } extern "C" { pub fn Gecko_XBLBinding_InheritsStyle(aXBLBinding: RawGeckoXBLBindingBorrowed) -> bool; @@ -2026,7 +2094,8 @@ extern "C" { extern "C" { pub fn Servo_InvalidateStyleForDocStateChanges( root: RawGeckoElementBorrowed, - sets: *const nsTArray, + doc_styles: RawServoStyleSetBorrowed, + non_document_styles: *const nsTArray, aStatesChanged: u64, ); } @@ -2093,7 +2162,7 @@ extern "C" { extern "C" { pub fn Servo_StyleSet_MediumFeaturesChanged( document_set: RawServoStyleSetBorrowed, - non_document_sets: *const nsTArray<*mut ServoStyleSet>, + non_document_sets: *mut nsTArray, may_affect_default_style: bool, ) -> MediumFeaturesChangedResult; } @@ -2230,6 +2299,24 @@ extern "C" { sizes: *mut ServoStyleSetSizes, ); } +extern "C" { + pub fn Servo_AuthorStyles_Create() -> *mut RawServoAuthorStyles; +} +extern "C" { + pub fn Servo_AuthorStyles_AppendStyleSheet( + self_: RawServoAuthorStylesBorrowedMut, + gecko_sheet: *const ServoStyleSheet, + ); +} +extern "C" { + pub fn Servo_AuthorStyles_ForceDirty(self_: RawServoAuthorStylesBorrowedMut); +} +extern "C" { + pub fn Servo_AuthorStyles_Flush( + self_: RawServoAuthorStylesBorrowedMut, + document_styles: RawServoStyleSetBorrowed, + ); +} extern "C" { pub fn Servo_StyleContext_AddRef(ctx: ServoStyleContextBorrowed); } diff --git a/components/style/gecko/generated/pseudo_element_definition.rs b/components/style/gecko/generated/pseudo_element_definition.rs index e5ff33c9028..2d70e5c33e8 100644 --- a/components/style/gecko/generated/pseudo_element_definition.rs +++ b/components/style/gecko/generated/pseudo_element_definition.rs @@ -1728,7 +1728,7 @@ impl ToCss for PseudoElement { dest.write_char('(')?; let mut iter = args.iter(); if let Some(first) = iter.next() { - serialize_atom_identifier(first, dest)?; + serialize_atom_identifier(&first, dest)?; for item in iter { dest.write_str(", ")?; serialize_atom_identifier(item, dest)?; diff --git a/components/style/gecko/generated/structs.rs b/components/style/gecko/generated/structs.rs index ec899494fe3..2643747df8b 100644 --- a/components/style/gecko/generated/structs.rs +++ b/components/style/gecko/generated/structs.rs @@ -1207,6 +1207,7 @@ pub mod root { pub mStrings: root::mozilla::css::URLValueData_RustOrGeckoString, pub mUsingRustString: bool, pub mLoadedImage: bool, + pub mCORSMode: root::mozilla::CORSMode, } pub type URLValueData_HasThreadSafeRefCnt = root::mozilla::TrueType; #[repr(C)] @@ -1376,6 +1377,18 @@ pub mod root { stringify!(mLoadedImage) ) ); + assert_eq!( + unsafe { + &(*(::std::ptr::null::())).mCORSMode as *const _ as usize + }, + 58usize, + concat!( + "Offset of field: ", + stringify!(URLValueData), + "::", + stringify!(mCORSMode) + ) + ); } #[repr(C)] #[derive(Debug)] @@ -2390,9 +2403,93 @@ pub mod root { } } #[repr(C)] - #[derive(Debug, Copy, Clone)] + #[derive(Debug, Copy)] + pub struct UserData { + pub _bindgen_opaque_blob: [u64; 2usize], + } + pub type UserData_destroyFunc = u64; + #[repr(C)] + #[derive(Debug, Copy)] + pub struct UserData_Entry { + pub _bindgen_opaque_blob: [u64; 3usize], + } + #[test] + fn bindgen_test_layout_UserData_Entry() { + assert_eq!( + ::std::mem::size_of::(), + 24usize, + concat!("Size of: ", stringify!(UserData_Entry)) + ); + assert_eq!( + ::std::mem::align_of::(), + 8usize, + concat!("Alignment of ", stringify!(UserData_Entry)) + ); + } + impl Clone for UserData_Entry { + fn clone(&self) -> Self { + *self + } + } + #[test] + fn bindgen_test_layout_UserData() { + assert_eq!( + ::std::mem::size_of::(), + 16usize, + concat!("Size of: ", stringify!(UserData)) + ); + assert_eq!( + ::std::mem::align_of::(), + 8usize, + concat!("Alignment of ", stringify!(UserData)) + ); + } + impl Clone for UserData { + fn clone(&self) -> Self { + *self + } + } + #[repr(C)] + pub struct SourceSurface__bindgen_vtable(::std::os::raw::c_void); + /// This is the base class for source surfaces. These objects are surfaces + /// which may be used as a source in a SurfacePattern or a DrawSurface call. + /// They cannot be drawn to directly. + /// + /// Although SourceSurface has thread-safe refcount, some SourceSurface cannot + /// be used on random threads at the same time. Only DataSourceSurface can be + /// used on random threads now. This will be fixed in the future. Eventually + /// all SourceSurface should be thread-safe. + #[repr(C)] + #[derive(Debug)] pub struct SourceSurface { - _unused: [u8; 0], + pub vtable_: *const SourceSurface__bindgen_vtable, + pub _base: u64, + pub mUserData: root::mozilla::gfx::UserData, + } + #[test] + fn bindgen_test_layout_SourceSurface() { + assert_eq!( + ::std::mem::size_of::(), + 32usize, + concat!("Size of: ", stringify!(SourceSurface)) + ); + assert_eq!( + ::std::mem::align_of::(), + 8usize, + concat!("Alignment of ", stringify!(SourceSurface)) + ); + assert_eq!( + unsafe { + &(*(::std::ptr::null::())).mUserData as *const _ as usize + }, + 16usize, + concat!( + "Offset of field: ", + stringify!(SourceSurface), + "::", + stringify!(mUserData) + ) + ); } } pub mod layers { @@ -5160,6 +5257,20 @@ pub mod root { *self } } + pub mod external { + #[allow(unused_imports)] + use self::super::super::super::root; + /// AtomicRefCounted is like RefCounted, with an atomically updated + /// reference counter. + /// + /// NOTE: Please do not use this class, use NS_INLINE_DECL_THREADSAFE_REFCOUNTING + /// instead. + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct AtomicRefCounted { + pub _address: u8, + } + } #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct SupportsWeakPtr { @@ -5644,6 +5755,10 @@ pub mod root { pub const StyleBackendType_Gecko: root::mozilla::StyleBackendType = 1; pub const StyleBackendType_Servo: root::mozilla::StyleBackendType = 2; pub type StyleBackendType = u8; + pub mod profiler { + #[allow(unused_imports)] + use self::super::super::super::root; + } pub type TimeStampValue = u64; /// Instances of this class represent the length of an interval of time. /// Negative durations are allowed, meaning the end is before the start. @@ -6590,6 +6705,25 @@ pub mod root { ); } #[test] + fn __bindgen_test_layout_DefaultDelete_open0_RawServoAuthorStyles_close0_instantiation() { + assert_eq!( + ::std::mem::size_of::(), + 1usize, + concat!( + "Size of template specialization: ", + stringify!(root::mozilla::DefaultDelete) + ) + ); + assert_eq!( + ::std::mem::align_of::(), + 1usize, + concat!( + "Alignment of template specialization: ", + stringify!(root::mozilla::DefaultDelete) + ) + ); + } + #[test] fn __bindgen_test_layout_DefaultDelete_open0_RawServoSelectorList_close0_instantiation() { assert_eq!( ::std::mem::size_of::(), @@ -8052,7 +8186,7 @@ pub mod root { pub const SERVO_PREF_ENABLED_page_break_after: bool = false; pub const SERVO_PREF_ENABLED_page_break_before: bool = false; pub const SERVO_PREF_ENABLED_page_break_inside: bool = false; - pub const SERVO_PREF_ENABLED_paint_order: bool = true; + pub const SERVO_PREF_ENABLED_paint_order: bool = false; pub const SERVO_PREF_ENABLED_perspective: bool = false; pub const SERVO_PREF_ENABLED_perspective_origin: bool = false; pub const SERVO_PREF_ENABLED_place_content: bool = false; @@ -11313,90 +11447,11 @@ pub mod root { ) ); } - /// A PostTraversalTask is a task to be performed immediately after a Servo - /// traversal. There are just a few tasks we need to perform, so we use this - /// class rather than Runnables, to avoid virtual calls and some allocations. - /// - /// A PostTraversalTask is only safe to run immediately after the Servo - /// traversal, since it can hold raw pointers to DOM objects. - #[repr(C)] - #[derive(Debug, Copy)] - pub struct PostTraversalTask { - pub mType: root::mozilla::PostTraversalTask_Type, - pub mTarget: *mut ::std::os::raw::c_void, - pub mResult: root::nsresult, - } - pub const PostTraversalTask_Type_ResolveFontFaceLoadedPromise: - root::mozilla::PostTraversalTask_Type = 0; - pub const PostTraversalTask_Type_RejectFontFaceLoadedPromise: - root::mozilla::PostTraversalTask_Type = 1; - pub const PostTraversalTask_Type_DispatchLoadingEventAndReplaceReadyPromise: - root::mozilla::PostTraversalTask_Type = 2; - pub const PostTraversalTask_Type_DispatchFontFaceSetCheckLoadingFinishedAfterDelay: - root::mozilla::PostTraversalTask_Type = 3; - pub const PostTraversalTask_Type_LoadFontEntry: root::mozilla::PostTraversalTask_Type = 4; - pub type PostTraversalTask_Type = i32; - #[test] - fn bindgen_test_layout_PostTraversalTask() { - assert_eq!( - ::std::mem::size_of::(), - 24usize, - concat!("Size of: ", stringify!(PostTraversalTask)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(PostTraversalTask)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mType as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(PostTraversalTask), - "::", - stringify!(mType) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mTarget as *const _ as usize - }, - 8usize, - concat!( - "Offset of field: ", - stringify!(PostTraversalTask), - "::", - stringify!(mTarget) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mResult as *const _ as usize - }, - 16usize, - concat!( - "Offset of field: ", - stringify!(PostTraversalTask), - "::", - stringify!(mResult) - ) - ); - } - impl Clone for PostTraversalTask { - fn clone(&self) -> Self { - *self - } - } #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct ServoStyleRuleMap { _unused: [u8; 0], } - pub const StylistState_NotDirty: root::mozilla::StylistState = 0; - pub const StylistState_StyleSheetsDirty: root::mozilla::StylistState = 1; - pub const StylistState_XBLStyleSheetsDirty: root::mozilla::StylistState = 2; - pub type StylistState = u8; pub const OriginFlags_UserAgent: root::mozilla::OriginFlags = root::mozilla::OriginFlags(1); pub const OriginFlags_User: root::mozilla::OriginFlags = root::mozilla::OriginFlags(2); pub const OriginFlags_Author: root::mozilla::OriginFlags = root::mozilla::OriginFlags(4); @@ -11430,183 +11485,6 @@ pub mod root { #[repr(C)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct OriginFlags(pub u8); - /// The set of style sheets that apply to a document, backed by a Servo - /// Stylist. A ServoStyleSet contains ServoStyleSheets. - #[repr(C)] - #[derive(Debug)] - pub struct ServoStyleSet { - pub mKind: root::mozilla::ServoStyleSet_Kind, - pub mDocument: *mut root::nsIDocument, - pub mRawSet: root::mozilla::UniquePtr, - pub mSheets: [u64; 9usize], - pub mAuthorStyleDisabled: bool, - pub mStylistState: root::mozilla::StylistState, - pub mUserFontSetUpdateGeneration: u64, - pub mUserFontCacheUpdateGeneration: u32, - pub mNeedsRestyleAfterEnsureUniqueInner: bool, - pub mNonInheritingStyleContexts: [u64; 7usize], - pub mPostTraversalTasks: root::nsTArray, - pub mStyleRuleMap: root::mozilla::UniquePtr, - } - pub type ServoStyleSet_SnapshotTable = root::mozilla::ServoElementSnapshotTable; - pub const ServoStyleSet_Kind_Master: root::mozilla::ServoStyleSet_Kind = 0; - pub const ServoStyleSet_Kind_ForXBL: root::mozilla::ServoStyleSet_Kind = 1; - pub type ServoStyleSet_Kind = u8; - #[test] - fn bindgen_test_layout_ServoStyleSet() { - assert_eq!( - ::std::mem::size_of::(), - 192usize, - concat!("Size of: ", stringify!(ServoStyleSet)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(ServoStyleSet)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mKind as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mKind) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mDocument as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mDocument) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mRawSet as *const _ as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mRawSet) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mSheets as *const _ as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mSheets) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mAuthorStyleDisabled as *const _ - as usize - }, - 96usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mAuthorStyleDisabled) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mStylistState as *const _ as usize - }, - 97usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mStylistState) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mUserFontSetUpdateGeneration - as *const _ as usize - }, - 104usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mUserFontSetUpdateGeneration) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mUserFontCacheUpdateGeneration - as *const _ as usize - }, - 112usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mUserFontCacheUpdateGeneration) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mNeedsRestyleAfterEnsureUniqueInner - as *const _ as usize - }, - 116usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mNeedsRestyleAfterEnsureUniqueInner) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mNonInheritingStyleContexts - as *const _ as usize - }, - 120usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mNonInheritingStyleContexts) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mPostTraversalTasks as *const _ - as usize - }, - 176usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mPostTraversalTasks) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).mStyleRuleMap as *const _ as usize - }, - 184usize, - concat!( - "Offset of field: ", - stringify!(ServoStyleSet), - "::", - stringify!(mStyleRuleMap) - ) - ); - } #[repr(C)] #[derive(Debug)] pub struct CachedInheritingStyles { @@ -12638,6 +12516,7 @@ pub mod root { NS_SUCCESS_UNORM_NOTFOUND = 7864337, NS_ERROR_NOT_IN_TREE = 2155348006, NS_OK_NO_NAME_CLAUSE_HANDLED = 7864354, + NS_ERROR_BLOCKED_BY_POLICY = 2155347971, } pub type nsrefcnt = root::MozRefCountType; #[repr(C)] @@ -13232,11 +13111,6 @@ pub mod root { pub struct RefPtr_ConstRemovingRefPtrTraits { pub _address: u8, } - #[repr(C)] - #[derive(Debug, Copy, Clone)] - pub struct JSContext { - _unused: [u8; 0], - } pub mod JS { #[allow(unused_imports)] use self::super::super::root; @@ -13724,6 +13598,11 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct JSContext { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct JSObject { _unused: [u8; 0], } @@ -15648,8 +15527,10 @@ pub mod root { root::nsChangeHint(536870912); pub const nsChangeHint_nsChangeHint_UpdateTableCellSpans: root::nsChangeHint = root::nsChangeHint(1073741824); + pub const nsChangeHint_nsChangeHint_VisibilityChange: root::nsChangeHint = + root::nsChangeHint(2147483648); pub const nsChangeHint_nsChangeHint_AllHints: root::nsChangeHint = - root::nsChangeHint(2147483647); + root::nsChangeHint(4294967295); impl ::std::ops::BitOr for root::nsChangeHint { type Output = Self; #[inline] @@ -16089,6 +15970,40 @@ pub mod root { ) ); } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct ProfilerBacktrace { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct ProfilerMarkerPayload { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy)] + pub struct ProfilerBacktraceDestructor { + pub _address: u8, + } + #[test] + fn bindgen_test_layout_ProfilerBacktraceDestructor() { + assert_eq!( + ::std::mem::size_of::(), + 1usize, + concat!("Size of: ", stringify!(ProfilerBacktraceDestructor)) + ); + assert_eq!( + ::std::mem::align_of::(), + 1usize, + concat!("Alignment of ", stringify!(ProfilerBacktraceDestructor)) + ); + } + impl Clone for ProfilerBacktraceDestructor { + fn clone(&self) -> Self { + *self + } + } + pub type UniqueProfilerBacktrace = root::mozilla::UniquePtr; pub const JSValueTag_JSVAL_TAG_MAX_DOUBLE: root::JSValueTag = 131056; pub const JSValueTag_JSVAL_TAG_INT32: root::JSValueTag = 131057; pub const JSValueTag_JSVAL_TAG_UNDEFINED: root::JSValueTag = 131059; @@ -16992,40 +16907,6 @@ pub mod root { ) ); } - #[repr(C)] - #[derive(Debug, Copy, Clone)] - pub struct ProfilerBacktrace { - _unused: [u8; 0], - } - #[repr(C)] - #[derive(Debug, Copy, Clone)] - pub struct ProfilerMarkerPayload { - _unused: [u8; 0], - } - #[repr(C)] - #[derive(Debug, Copy)] - pub struct ProfilerBacktraceDestructor { - pub _address: u8, - } - #[test] - fn bindgen_test_layout_ProfilerBacktraceDestructor() { - assert_eq!( - ::std::mem::size_of::(), - 1usize, - concat!("Size of: ", stringify!(ProfilerBacktraceDestructor)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(ProfilerBacktraceDestructor)) - ); - } - impl Clone for ProfilerBacktraceDestructor { - fn clone(&self) -> Self { - *self - } - } - pub type UniqueProfilerBacktrace = root::mozilla::UniquePtr; pub type gfxSize = [u64; 2usize]; #[repr(C)] #[derive(Debug, Copy)] @@ -21788,6 +21669,11 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] + pub struct RawServoAuthorStyles { + _unused: [u8; 0], + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] pub struct RawServoStyleSet { _unused: [u8; 0], } @@ -22013,7 +21899,7 @@ pub mod root { pub mStateObjectContainer: root::nsCOMPtr, pub mStateObjectCached: root::nsCOMPtr, pub mInSyncOperationCount: u32, - pub mXPathEvaluator: root::RefPtr, + pub mXPathEvaluator: root::mozilla::UniquePtr, pub mAnonymousContents: root::nsTArray>, pub mBlockDOMContentLoaded: u32, pub mDOMMediaQueryLists: root::mozilla::LinkedList, @@ -25049,74 +24935,63 @@ pub mod root { } } #[inline] - pub fn mFireAfterPaintEvents(&self) -> ::std::os::raw::c_uint { + pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { unsafe { ::std::mem::transmute(self._bitfield_1.get(33usize, 1u8) as u32) } } #[inline] - pub fn set_mFireAfterPaintEvents(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(33usize, 1u8, val as u64) } } #[inline] - pub fn mIsChrome(&self) -> ::std::os::raw::c_uint { + pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { unsafe { ::std::mem::transmute(self._bitfield_1.get(34usize, 1u8) as u32) } } #[inline] - pub fn set_mIsChrome(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mIsChromeOriginImage(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(34usize, 1u8, val as u64) } } #[inline] - pub fn mIsChromeOriginImage(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { unsafe { ::std::mem::transmute(self._bitfield_1.get(35usize, 1u8) as u32) } } #[inline] - pub fn set_mIsChromeOriginImage(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(35usize, 1u8, val as u64) } } #[inline] - pub fn mPaintFlashing(&self) -> ::std::os::raw::c_uint { + pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { unsafe { ::std::mem::transmute(self._bitfield_1.get(36usize, 1u8) as u32) } } #[inline] - pub fn set_mPaintFlashing(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mPaintFlashingInitialized(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(36usize, 1u8, val as u64) } } #[inline] - pub fn mPaintFlashingInitialized(&self) -> ::std::os::raw::c_uint { + pub fn mHasWarnedAboutPositionedTableParts(&self) -> ::std::os::raw::c_uint { unsafe { ::std::mem::transmute(self._bitfield_1.get(37usize, 1u8) as u32) } } #[inline] - pub fn set_mPaintFlashingInitialized(&mut self, val: ::std::os::raw::c_uint) { + pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(37usize, 1u8, val as u64) } } #[inline] - pub fn mHasWarnedAboutPositionedTableParts(&self) -> ::std::os::raw::c_uint { - unsafe { ::std::mem::transmute(self._bitfield_1.get(38usize, 1u8) as u32) } - } - #[inline] - pub fn set_mHasWarnedAboutPositionedTableParts(&mut self, val: ::std::os::raw::c_uint) { - unsafe { - let val: u32 = ::std::mem::transmute(val); - self._bitfield_1.set(38usize, 1u8, val as u64) - } - } - #[inline] pub fn mHasWarnedAboutTooLargeDashedOrDottedRadius(&self) -> ::std::os::raw::c_uint { - unsafe { ::std::mem::transmute(self._bitfield_1.get(39usize, 1u8) as u32) } + unsafe { ::std::mem::transmute(self._bitfield_1.get(38usize, 1u8) as u32) } } #[inline] pub fn set_mHasWarnedAboutTooLargeDashedOrDottedRadius( @@ -25125,40 +25000,40 @@ pub mod root { ) { unsafe { let val: u32 = ::std::mem::transmute(val); - self._bitfield_1.set(39usize, 1u8, val as u64) + self._bitfield_1.set(38usize, 1u8, val as u64) } } #[inline] pub fn mQuirkSheetAdded(&self) -> ::std::os::raw::c_uint { - unsafe { ::std::mem::transmute(self._bitfield_1.get(40usize, 1u8) as u32) } + unsafe { ::std::mem::transmute(self._bitfield_1.get(39usize, 1u8) as u32) } } #[inline] pub fn set_mQuirkSheetAdded(&mut self, val: ::std::os::raw::c_uint) { + unsafe { + let val: u32 = ::std::mem::transmute(val); + self._bitfield_1.set(39usize, 1u8, val as u64) + } + } + #[inline] + pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { + unsafe { ::std::mem::transmute(self._bitfield_1.get(40usize, 1u8) as u32) } + } + #[inline] + pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); self._bitfield_1.set(40usize, 1u8, val as u64) } } #[inline] - pub fn mNeedsPrefUpdate(&self) -> ::std::os::raw::c_uint { - unsafe { ::std::mem::transmute(self._bitfield_1.get(41usize, 1u8) as u32) } - } - #[inline] - pub fn set_mNeedsPrefUpdate(&mut self, val: ::std::os::raw::c_uint) { - unsafe { - let val: u32 = ::std::mem::transmute(val); - self._bitfield_1.set(41usize, 1u8, val as u64) - } - } - #[inline] pub fn mHadNonBlankPaint(&self) -> ::std::os::raw::c_uint { - unsafe { ::std::mem::transmute(self._bitfield_1.get(42usize, 1u8) as u32) } + unsafe { ::std::mem::transmute(self._bitfield_1.get(41usize, 1u8) as u32) } } #[inline] pub fn set_mHadNonBlankPaint(&mut self, val: ::std::os::raw::c_uint) { unsafe { let val: u32 = ::std::mem::transmute(val); - self._bitfield_1.set(42usize, 1u8, val as u64) + self._bitfield_1.set(41usize, 1u8, val as u64) } } #[inline] @@ -25195,7 +25070,6 @@ pub mod root { mFontFeatureValuesDirty: ::std::os::raw::c_uint, mSuppressResizeReflow: ::std::os::raw::c_uint, mIsVisual: ::std::os::raw::c_uint, - mFireAfterPaintEvents: ::std::os::raw::c_uint, mIsChrome: ::std::os::raw::c_uint, mIsChromeOriginImage: ::std::os::raw::c_uint, mPaintFlashing: ::std::os::raw::c_uint, @@ -25355,47 +25229,42 @@ pub mod root { mIsVisual as u64 }); __bindgen_bitfield_unit.set(33usize, 1u8, { - let mFireAfterPaintEvents: u32 = - unsafe { ::std::mem::transmute(mFireAfterPaintEvents) }; - mFireAfterPaintEvents as u64 - }); - __bindgen_bitfield_unit.set(34usize, 1u8, { let mIsChrome: u32 = unsafe { ::std::mem::transmute(mIsChrome) }; mIsChrome as u64 }); - __bindgen_bitfield_unit.set(35usize, 1u8, { + __bindgen_bitfield_unit.set(34usize, 1u8, { let mIsChromeOriginImage: u32 = unsafe { ::std::mem::transmute(mIsChromeOriginImage) }; mIsChromeOriginImage as u64 }); - __bindgen_bitfield_unit.set(36usize, 1u8, { + __bindgen_bitfield_unit.set(35usize, 1u8, { let mPaintFlashing: u32 = unsafe { ::std::mem::transmute(mPaintFlashing) }; mPaintFlashing as u64 }); - __bindgen_bitfield_unit.set(37usize, 1u8, { + __bindgen_bitfield_unit.set(36usize, 1u8, { let mPaintFlashingInitialized: u32 = unsafe { ::std::mem::transmute(mPaintFlashingInitialized) }; mPaintFlashingInitialized as u64 }); - __bindgen_bitfield_unit.set(38usize, 1u8, { + __bindgen_bitfield_unit.set(37usize, 1u8, { let mHasWarnedAboutPositionedTableParts: u32 = unsafe { ::std::mem::transmute(mHasWarnedAboutPositionedTableParts) }; mHasWarnedAboutPositionedTableParts as u64 }); - __bindgen_bitfield_unit.set(39usize, 1u8, { + __bindgen_bitfield_unit.set(38usize, 1u8, { let mHasWarnedAboutTooLargeDashedOrDottedRadius: u32 = unsafe { ::std::mem::transmute(mHasWarnedAboutTooLargeDashedOrDottedRadius) }; mHasWarnedAboutTooLargeDashedOrDottedRadius as u64 }); - __bindgen_bitfield_unit.set(40usize, 1u8, { + __bindgen_bitfield_unit.set(39usize, 1u8, { let mQuirkSheetAdded: u32 = unsafe { ::std::mem::transmute(mQuirkSheetAdded) }; mQuirkSheetAdded as u64 }); - __bindgen_bitfield_unit.set(41usize, 1u8, { + __bindgen_bitfield_unit.set(40usize, 1u8, { let mNeedsPrefUpdate: u32 = unsafe { ::std::mem::transmute(mNeedsPrefUpdate) }; mNeedsPrefUpdate as u64 }); - __bindgen_bitfield_unit.set(42usize, 1u8, { + __bindgen_bitfield_unit.set(41usize, 1u8, { let mHadNonBlankPaint: u32 = unsafe { ::std::mem::transmute(mHadNonBlankPaint) }; mHadNonBlankPaint as u64 }); @@ -28694,8 +28563,8 @@ pub mod root { pub mLoadFlags: root::nsLoadFlags, pub mLockCount: u32, pub mAnimationConsumers: u32, - pub _bitfield_1: root::__BindgenBitfieldUnit<[u8; 1usize], u8>, - pub __bindgen_padding_0: [u8; 3usize], + pub _bitfield_1: root::__BindgenBitfieldUnit<[u8; 2usize], u8>, + pub __bindgen_padding_0: u16, } pub type imgRequestProxy_Image = root::mozilla::image::Image; pub type imgRequestProxy_ImageURL = root::mozilla::image::ImageURL; @@ -28820,36 +28689,47 @@ pub mod root { } } #[inline] - pub fn mDeferNotifications(&self) -> bool { + pub fn mPendingNotify(&self) -> bool { unsafe { ::std::mem::transmute(self._bitfield_1.get(5usize, 1u8) as u8) } } #[inline] - pub fn set_mDeferNotifications(&mut self, val: bool) { + pub fn set_mPendingNotify(&mut self, val: bool) { unsafe { let val: u8 = ::std::mem::transmute(val); self._bitfield_1.set(5usize, 1u8, val as u64) } } #[inline] - pub fn mHadListener(&self) -> bool { + pub fn mValidating(&self) -> bool { unsafe { ::std::mem::transmute(self._bitfield_1.get(6usize, 1u8) as u8) } } #[inline] - pub fn set_mHadListener(&mut self, val: bool) { + pub fn set_mValidating(&mut self, val: bool) { unsafe { let val: u8 = ::std::mem::transmute(val); self._bitfield_1.set(6usize, 1u8, val as u64) } } #[inline] - pub fn mHadDispatch(&self) -> bool { + pub fn mHadListener(&self) -> bool { unsafe { ::std::mem::transmute(self._bitfield_1.get(7usize, 1u8) as u8) } } #[inline] + pub fn set_mHadListener(&mut self, val: bool) { + unsafe { + let val: u8 = ::std::mem::transmute(val); + self._bitfield_1.set(7usize, 1u8, val as u64) + } + } + #[inline] + pub fn mHadDispatch(&self) -> bool { + unsafe { ::std::mem::transmute(self._bitfield_1.get(8usize, 1u8) as u8) } + } + #[inline] pub fn set_mHadDispatch(&mut self, val: bool) { unsafe { let val: u8 = ::std::mem::transmute(val); - self._bitfield_1.set(7usize, 1u8, val as u64) + self._bitfield_1.set(8usize, 1u8, val as u64) } } #[inline] @@ -28859,12 +28739,13 @@ pub mod root { mForceDispatchLoadGroup: bool, mListenerIsStrongRef: bool, mDecodeRequested: bool, - mDeferNotifications: bool, + mPendingNotify: bool, + mValidating: bool, mHadListener: bool, mHadDispatch: bool, - ) -> root::__BindgenBitfieldUnit<[u8; 1usize], u8> { + ) -> root::__BindgenBitfieldUnit<[u8; 2usize], u8> { let mut __bindgen_bitfield_unit: root::__BindgenBitfieldUnit< - [u8; 1usize], + [u8; 2usize], u8, > = Default::default(); __bindgen_bitfield_unit.set(0usize, 1u8, { @@ -28890,14 +28771,18 @@ pub mod root { mDecodeRequested as u64 }); __bindgen_bitfield_unit.set(5usize, 1u8, { - let mDeferNotifications: u8 = unsafe { ::std::mem::transmute(mDeferNotifications) }; - mDeferNotifications as u64 + let mPendingNotify: u8 = unsafe { ::std::mem::transmute(mPendingNotify) }; + mPendingNotify as u64 }); __bindgen_bitfield_unit.set(6usize, 1u8, { + let mValidating: u8 = unsafe { ::std::mem::transmute(mValidating) }; + mValidating as u64 + }); + __bindgen_bitfield_unit.set(7usize, 1u8, { let mHadListener: u8 = unsafe { ::std::mem::transmute(mHadListener) }; mHadListener as u64 }); - __bindgen_bitfield_unit.set(7usize, 1u8, { + __bindgen_bitfield_unit.set(8usize, 1u8, { let mHadDispatch: u8 = unsafe { ::std::mem::transmute(mHadDispatch) }; mHadDispatch as u64 }); @@ -37181,18 +37066,6 @@ pub mod root { pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozPlaceholder: u32 = 8; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_placeholder: u32 = 8; pub const SERVO_CSS_PSEUDO_ELEMENT_FLAGS_mozColorSwatch: u32 = 12; - pub type nsCSSAnonBoxes_NonInheritingBase = u8; - pub const nsCSSAnonBoxes_NonInheriting_oofPlaceholder: root::nsCSSAnonBoxes_NonInheriting = 0; - pub const nsCSSAnonBoxes_NonInheriting_horizontalFramesetBorder: - root::nsCSSAnonBoxes_NonInheriting = 1; - pub const nsCSSAnonBoxes_NonInheriting_verticalFramesetBorder: - root::nsCSSAnonBoxes_NonInheriting = 2; - pub const nsCSSAnonBoxes_NonInheriting_framesetBlank: root::nsCSSAnonBoxes_NonInheriting = 3; - pub const nsCSSAnonBoxes_NonInheriting_tableColGroup: root::nsCSSAnonBoxes_NonInheriting = 4; - pub const nsCSSAnonBoxes_NonInheriting_tableCol: root::nsCSSAnonBoxes_NonInheriting = 5; - pub const nsCSSAnonBoxes_NonInheriting_pageBreak: root::nsCSSAnonBoxes_NonInheriting = 6; - pub const nsCSSAnonBoxes_NonInheriting__Count: root::nsCSSAnonBoxes_NonInheriting = 7; - pub type nsCSSAnonBoxes_NonInheriting = u8; /// templated hashtable class maps keys to interface pointers. /// See nsBaseHashtable for complete declaration. /// @param KeyClass a wrapper-class for the hashtable key, see nsHashKeys.h @@ -38701,6 +38574,26 @@ pub mod root { ); } #[test] + fn __bindgen_test_layout_UniquePtr_open0_ProfilerBacktrace_ProfilerBacktraceDestructor_close0_instantiation( +) { + assert_eq!( + ::std::mem::size_of::>(), + 8usize, + concat!( + "Size of template specialization: ", + stringify!(root::mozilla::UniquePtr) + ) + ); + assert_eq!( + ::std::mem::align_of::>(), + 8usize, + concat!( + "Alignment of template specialization: ", + stringify!(root::mozilla::UniquePtr) + ) + ); + } + #[test] fn __bindgen_test_layout_BaseTimeDuration_open0_TimeDurationValueCalculator_close0_instantiation( ) { assert_eq!( @@ -39129,26 +39022,6 @@ pub mod root { ); } #[test] - fn __bindgen_test_layout_UniquePtr_open0_ProfilerBacktrace_ProfilerBacktraceDestructor_close0_instantiation( -) { - assert_eq!( - ::std::mem::size_of::>(), - 8usize, - concat!( - "Size of template specialization: ", - stringify!(root::mozilla::UniquePtr) - ) - ); - assert_eq!( - ::std::mem::align_of::>(), - 8usize, - concat!( - "Alignment of template specialization: ", - stringify!(root::mozilla::UniquePtr) - ) - ); - } - #[test] fn __bindgen_test_layout_RefPtr_open0_nsNodeInfoManager_close0_instantiation() { assert_eq!( ::std::mem::size_of::>(), @@ -41182,21 +41055,41 @@ pub mod root { ); } #[test] - fn __bindgen_test_layout_RefPtr_open0_XPathEvaluator_close0_instantiation() { + fn __bindgen_test_layout_UniquePtr_open0_XPathEvaluator_DefaultDelete_open1_XPathEvaluator_close1_close0_instantiation( +) { assert_eq!( - ::std::mem::size_of::>(), + ::std::mem::size_of::>(), 8usize, concat!( "Size of template specialization: ", - stringify!(root::RefPtr) + stringify!(root::mozilla::UniquePtr) ) ); assert_eq!( - ::std::mem::align_of::>(), + ::std::mem::align_of::>(), 8usize, concat!( "Alignment of template specialization: ", - stringify!(root::RefPtr) + stringify!(root::mozilla::UniquePtr) + ) + ); + } + #[test] + fn __bindgen_test_layout_DefaultDelete_open0_XPathEvaluator_close0_instantiation() { + assert_eq!( + ::std::mem::size_of::(), + 1usize, + concat!( + "Size of template specialization: ", + stringify!(root::mozilla::DefaultDelete) + ) + ); + assert_eq!( + ::std::mem::align_of::(), + 1usize, + concat!( + "Alignment of template specialization: ", + stringify!(root::mozilla::DefaultDelete) ) ); } @@ -41455,6 +41348,25 @@ pub mod root { ); } #[test] + fn __bindgen_test_layout_nsTArray_open0_nsRect_close0_instantiation() { + assert_eq!( + ::std::mem::size_of::>(), + 8usize, + concat!( + "Size of template specialization: ", + stringify!(root::nsTArray) + ) + ); + assert_eq!( + ::std::mem::align_of::>(), + 8usize, + concat!( + "Alignment of template specialization: ", + stringify!(root::nsTArray) + ) + ); + } + #[test] fn __bindgen_test_layout_nsCOMPtr_open0_nsIDocument_close0_instantiation_6() { assert_eq!( ::std::mem::size_of::(), @@ -41798,25 +41710,6 @@ pub mod root { ); } #[test] - fn __bindgen_test_layout_nsTArray_open0_nsRect_close0_instantiation() { - assert_eq!( - ::std::mem::size_of::>(), - 8usize, - concat!( - "Size of template specialization: ", - stringify!(root::nsTArray) - ) - ); - assert_eq!( - ::std::mem::align_of::>(), - 8usize, - concat!( - "Alignment of template specialization: ", - stringify!(root::nsTArray) - ) - ); - } - #[test] fn __bindgen_test_layout_nsAutoPtr_open0_gfxTextPerfMetrics_close0_instantiation() { assert_eq!( ::std::mem::size_of::>(), @@ -45244,64 +45137,6 @@ pub mod root { ); } #[test] - fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_ServoStyleSheet_close1_close0_instantiation( -) { - assert_eq!( - ::std::mem::size_of::>>(), - 8usize, - concat!( - "Size of template specialization: ", - stringify!(root::nsTArray>) - ) - ); - assert_eq!( - ::std::mem::align_of::>>(), - 8usize, - concat!( - "Alignment of template specialization: ", - stringify!(root::nsTArray>) - ) - ); - } - #[test] - fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation() { - assert_eq!( - ::std::mem::size_of::>(), - 8usize, - concat!( - "Size of template specialization: ", - stringify!(root::RefPtr) - ) - ); - assert_eq!( - ::std::mem::align_of::>(), - 8usize, - concat!( - "Alignment of template specialization: ", - stringify!(root::RefPtr) - ) - ); - } - #[test] - fn __bindgen_test_layout_nsTArray_open0_PostTraversalTask_close0_instantiation() { - assert_eq!( - ::std::mem::size_of::>(), - 8usize, - concat!( - "Size of template specialization: ", - stringify!(root::nsTArray) - ) - ); - assert_eq!( - ::std::mem::align_of::>(), - 8usize, - concat!( - "Alignment of template specialization: ", - stringify!(root::nsTArray) - ) - ); - } - #[test] fn __bindgen_test_layout_UniquePtr_open0_ServoStyleRuleMap_DefaultDelete_open1_ServoStyleRuleMap_close1_close0_instantiation( ) { assert_eq!( @@ -45494,7 +45329,7 @@ pub mod root { ); } #[test] - fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation_1() { + fn __bindgen_test_layout_RefPtr_open0_ServoStyleContext_close0_instantiation() { assert_eq!( ::std::mem::size_of::>(), 8usize, diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 1ddb9f386ae..957264a38f5 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -36,6 +36,8 @@ use style::gecko::wrapper::{GeckoElement, GeckoNode}; use style::gecko_bindings::bindings; use style::gecko_bindings::bindings::{RawGeckoElementBorrowed, RawGeckoElementBorrowedOrNull, RawGeckoNodeBorrowed}; use style::gecko_bindings::bindings::{RawGeckoKeyframeListBorrowed, RawGeckoKeyframeListBorrowedMut}; +use style::gecko_bindings::bindings::{RawServoAuthorStyles, RawServoAuthorStylesBorrowed}; +use style::gecko_bindings::bindings::{RawServoAuthorStylesBorrowedMut, RawServoAuthorStylesOwned}; use style::gecko_bindings::bindings::{RawServoDeclarationBlockBorrowed, RawServoDeclarationBlockStrong}; use style::gecko_bindings::bindings::{RawServoDocumentRule, RawServoDocumentRuleBorrowed}; use style::gecko_bindings::bindings::{RawServoFontFeatureValuesRule, RawServoFontFeatureValuesRuleBorrowed}; @@ -52,8 +54,6 @@ use style::gecko_bindings::bindings::{RawServoStyleSetBorrowed, RawServoStyleSet use style::gecko_bindings::bindings::{RawServoStyleSheetContentsBorrowed, ServoComputedDataBorrowed}; use style::gecko_bindings::bindings::{RawServoStyleSheetContentsStrong, ServoStyleContextBorrowed}; use style::gecko_bindings::bindings::{RawServoSupportsRule, RawServoSupportsRuleBorrowed}; -use style::gecko_bindings::bindings::{RawServoAuthorStyles, RawServoAuthorStylesBorrowed}; -use style::gecko_bindings::bindings::{RawServoAuthorStylesBorrowedMut, RawServoAuthorStylesOwned}; use style::gecko_bindings::bindings::{ServoCssRulesBorrowed, ServoCssRulesStrong}; use style::gecko_bindings::bindings::{nsACString, nsAString, nsCSSPropertyIDSetBorrowedMut}; use style::gecko_bindings::bindings::Gecko_AddPropertyToSet;