diff --git a/ports/geckolib/gecko_bindings/bindings.rs b/ports/geckolib/gecko_bindings/bindings.rs index 2a330fb21b6..99baada7fe9 100644 --- a/ports/geckolib/gecko_bindings/bindings.rs +++ b/ports/geckolib/gecko_bindings/bindings.rs @@ -302,7 +302,8 @@ extern "C" { pub fn Gecko_GetNodeFlags(node: *mut RawGeckoNode) -> u32; pub fn Gecko_SetNodeFlags(node: *mut RawGeckoNode, flags: u32); pub fn Gecko_UnsetNodeFlags(node: *mut RawGeckoNode, flags: u32); - pub fn Gecko_GetStyleContext(node: *mut RawGeckoNode) + pub fn Gecko_GetStyleContext(node: *mut RawGeckoNode, + aPseudoTagOrNull: *mut nsIAtom) -> *mut nsStyleContext; pub fn Gecko_CalcStyleDifference(oldstyle: *mut nsStyleContext, newstyle: ServoComputedValuesBorrowed) @@ -311,6 +312,8 @@ extern "C" { change: nsChangeHint); pub fn Gecko_EnsureTArrayCapacity(array: *mut ::std::os::raw::c_void, capacity: usize, elem_size: usize); + pub fn Gecko_ClearPODTArray(array: *mut ::std::os::raw::c_void, + elem_size: usize, elem_align: usize); pub fn Gecko_EnsureImageLayersLength(layers: *mut nsStyleImageLayers, len: usize); pub fn Gecko_InitializeImageLayer(layer: *mut Layer, diff --git a/ports/geckolib/gecko_bindings/structs_debug.rs b/ports/geckolib/gecko_bindings/structs_debug.rs index aba838068c0..f726e9ee3ff 100644 --- a/ports/geckolib/gecko_bindings/structs_debug.rs +++ b/ports/geckolib/gecko_bindings/structs_debug.rs @@ -6567,16 +6567,13 @@ fn bindgen_test_layout_nsStyleCounterData() { #[derive(Debug)] pub struct nsStyleContent { pub mMarkerOffset: nsStyleCoord, - pub mContents: *mut nsStyleContentData, - pub mIncrements: *mut nsStyleCounterData, - pub mResets: *mut nsStyleCounterData, - pub mContentCount: u32, - pub mIncrementCount: u32, - pub mResetCount: u32, + pub mContents: nsTArray, + pub mIncrements: nsTArray, + pub mResets: nsTArray, } #[test] fn bindgen_test_layout_nsStyleContent() { - assert_eq!(::std::mem::size_of::() , 56usize); + assert_eq!(::std::mem::size_of::() , 40usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)] diff --git a/ports/geckolib/gecko_bindings/structs_release.rs b/ports/geckolib/gecko_bindings/structs_release.rs index 26dc0b01f61..3f4a833acd7 100644 --- a/ports/geckolib/gecko_bindings/structs_release.rs +++ b/ports/geckolib/gecko_bindings/structs_release.rs @@ -6544,16 +6544,13 @@ fn bindgen_test_layout_nsStyleCounterData() { #[derive(Debug)] pub struct nsStyleContent { pub mMarkerOffset: nsStyleCoord, - pub mContents: *mut nsStyleContentData, - pub mIncrements: *mut nsStyleCounterData, - pub mResets: *mut nsStyleCounterData, - pub mContentCount: u32, - pub mIncrementCount: u32, - pub mResetCount: u32, + pub mContents: nsTArray, + pub mIncrements: nsTArray, + pub mResets: nsTArray, } #[test] fn bindgen_test_layout_nsStyleContent() { - assert_eq!(::std::mem::size_of::() , 56usize); + assert_eq!(::std::mem::size_of::() , 40usize); assert_eq!(::std::mem::align_of::() , 8usize); } #[repr(C)]