stylo: Regenerate bindings to take into account the nsStyleContent cl…

…eanup.
servo · Aug 18, 2016 · ad5fb58 · ad5fb58
1 parent c769db6
commit ad5fb58
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git 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
@@ -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<nsStyleContentData>,
+    pub mIncrements: nsTArray<nsStyleCounterData>,
+    pub mResets: nsTArray<nsStyleCounterData>,
 }
 #[test]
 fn bindgen_test_layout_nsStyleContent() {
-    assert_eq!(::std::mem::size_of::<nsStyleContent>() , 56usize);
+    assert_eq!(::std::mem::size_of::<nsStyleContent>() , 40usize);
     assert_eq!(::std::mem::align_of::<nsStyleContent>() , 8usize);
 }
 #[repr(C)]

diff --git 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<nsStyleContentData>,
+    pub mIncrements: nsTArray<nsStyleCounterData>,
+    pub mResets: nsTArray<nsStyleCounterData>,
 }
 #[test]
 fn bindgen_test_layout_nsStyleContent() {
-    assert_eq!(::std::mem::size_of::<nsStyleContent>() , 56usize);
+    assert_eq!(::std::mem::size_of::<nsStyleContent>() , 40usize);
     assert_eq!(::std::mem::align_of::<nsStyleContent>() , 8usize);
 }
 #[repr(C)]