diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs index 89010477bee..c68b1294437 100644 --- a/components/style/gecko_bindings/bindings.rs +++ b/components/style/gecko_bindings/bindings.rs @@ -428,11 +428,14 @@ extern "C" { extern "C" { pub fn Gecko_LoadStyleSheet(loader: *mut Loader, parent: *mut ServoStyleSheet, - import_rule: RawServoImportRuleBorrowed, + child_sheet: RawServoStyleSheetBorrowed, base_url_data: *mut RawGeckoURLExtraData, url_bytes: *const u8, url_length: u32, media_bytes: *const u8, media_length: u32); } +extern "C" { + pub fn Gecko_URLExtraData_CreateDummy() -> *mut RawGeckoURLExtraData; +} extern "C" { pub fn Gecko_MaybeCreateStyleChildrenIterator(node: RawGeckoNodeBorrowed) -> StyleChildrenIteratorOwnedOrNull; @@ -1377,7 +1380,6 @@ extern "C" { *mut ServoStyleSheet, data: *const nsACString, parsing_mode: SheetParsingMode, - base_url: *const nsACString, extra_data: *mut RawGeckoURLExtraData) -> RawServoStyleSheetStrong; @@ -1466,8 +1468,9 @@ extern "C" { pub fn Servo_CssRules_InsertRule(rules: ServoCssRulesBorrowed, sheet: RawServoStyleSheetBorrowed, rule: *const nsACString, index: u32, - nested: bool, rule_type: *mut u16) - -> nsresult; + nested: bool, loader: *mut Loader, + gecko_stylesheet: *mut ServoStyleSheet, + rule_type: *mut u16) -> nsresult; } extern "C" { pub fn Servo_CssRules_DeleteRule(rules: ServoCssRulesBorrowed, index: u32) @@ -1549,13 +1552,11 @@ extern "C" { extern "C" { pub fn Servo_ParseProperty(property: *const nsACString, value: *const nsACString, - base: *const nsACString, data: *mut RawGeckoURLExtraData) -> RawServoDeclarationBlockStrong; } extern "C" { pub fn Servo_ParseEasing(easing: *const nsAString, - base: *const nsACString, data: *mut RawGeckoURLExtraData, output: nsTimingFunctionBorrowedMut) -> bool; } @@ -1610,7 +1611,6 @@ extern "C" { } extern "C" { pub fn Servo_ParseStyleAttribute(data: *const nsACString, - base: *const nsACString, extra_data: *mut RawGeckoURLExtraData) -> RawServoDeclarationBlockStrong; } @@ -1678,7 +1678,6 @@ extern "C" { property: *const nsACString, value: *const nsACString, is_important: bool, - base: *const nsACString, data: *mut RawGeckoURLExtraData) -> bool; } @@ -1688,7 +1687,6 @@ extern "C" { property: nsCSSPropertyID, value: *const nsACString, is_important: bool, - base: *const nsACString, data: *mut RawGeckoURLExtraData) -> bool; diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs index 3cb0c48012b..58f435393e5 100644 --- a/components/style/gecko_bindings/structs_debug.rs +++ b/components/style/gecko_bindings/structs_debug.rs @@ -5626,7 +5626,8 @@ pub mod root { #[derive(Debug)] pub struct StyleSheet { pub _base: root::nsIDOMCSSStyleSheet, - pub _base_1: root::nsWrapperCache, + pub _base_1: root::nsICSSLoaderObserver, + pub _base_2: root::nsWrapperCache, pub mRefCnt: root::nsCycleCollectingAutoRefCnt, pub _mOwningThread: root::nsAutoOwningThread, pub mParent: *mut root::mozilla::StyleSheet, @@ -5709,7 +5710,7 @@ pub mod root { } #[test] fn bindgen_test_layout_StyleSheet() { - assert_eq!(::std::mem::size_of::() , 128usize , concat + assert_eq!(::std::mem::size_of::() , 136usize , concat ! ( "Size of: " , stringify ! ( StyleSheet ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheet ) )); @@ -14743,6 +14744,30 @@ pub mod root { fn clone(&self) -> Self { *self } } #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsICSSLoaderObserver { + pub _base: root::nsISupports, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct nsICSSLoaderObserver_COMTypeInfo { + pub _address: u8, + pub _phantom_0: ::std::marker::PhantomData, + pub _phantom_1: ::std::marker::PhantomData, + } + #[test] + fn bindgen_test_layout_nsICSSLoaderObserver() { + assert_eq!(::std::mem::size_of::() , 8usize , + concat ! ( + "Size of: " , stringify ! ( nsICSSLoaderObserver ) )); + assert_eq! (::std::mem::align_of::() , 8usize , + concat ! ( + "Alignment of " , stringify ! ( nsICSSLoaderObserver ) )); + } + impl Clone for nsICSSLoaderObserver { + fn clone(&self) -> Self { *self } + } + #[repr(C)] #[derive(Debug)] pub struct nsAttrValue { pub mBits: usize, diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs index 8442777cbcc..06bbbc53ae3 100644 --- a/components/style/gecko_bindings/structs_release.rs +++ b/components/style/gecko_bindings/structs_release.rs @@ -5535,7 +5535,8 @@ pub mod root { #[derive(Debug)] pub struct StyleSheet { pub _base: root::nsIDOMCSSStyleSheet, - pub _base_1: root::nsWrapperCache, + pub _base_1: root::nsICSSLoaderObserver, + pub _base_2: root::nsWrapperCache, pub mRefCnt: root::nsCycleCollectingAutoRefCnt, pub mParent: *mut root::mozilla::StyleSheet, pub mTitle: ::nsstring::nsStringRepr, @@ -5617,7 +5618,7 @@ pub mod root { } #[test] fn bindgen_test_layout_StyleSheet() { - assert_eq!(::std::mem::size_of::() , 120usize , concat + assert_eq!(::std::mem::size_of::() , 128usize , concat ! ( "Size of: " , stringify ! ( StyleSheet ) )); assert_eq! (::std::mem::align_of::() , 8usize , concat ! ( "Alignment of " , stringify ! ( StyleSheet ) )); @@ -14233,6 +14234,30 @@ pub mod root { fn clone(&self) -> Self { *self } } #[repr(C)] + #[derive(Debug, Copy)] + pub struct nsICSSLoaderObserver { + pub _base: root::nsISupports, + } + #[repr(C)] + #[derive(Debug, Copy, Clone)] + pub struct nsICSSLoaderObserver_COMTypeInfo { + pub _address: u8, + pub _phantom_0: ::std::marker::PhantomData, + pub _phantom_1: ::std::marker::PhantomData, + } + #[test] + fn bindgen_test_layout_nsICSSLoaderObserver() { + assert_eq!(::std::mem::size_of::() , 8usize , + concat ! ( + "Size of: " , stringify ! ( nsICSSLoaderObserver ) )); + assert_eq! (::std::mem::align_of::() , 8usize , + concat ! ( + "Alignment of " , stringify ! ( nsICSSLoaderObserver ) )); + } + impl Clone for nsICSSLoaderObserver { + fn clone(&self) -> Self { *self } + } + #[repr(C)] #[derive(Debug)] pub struct nsAttrValue { pub mBits: usize,