From ad5fb58e07572b4dca7cfbc8c441297e807b9aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <ecoal95@gmail.com>
Date: Thu, 11 Aug 2016 21:57:22 -0700
Subject: [PATCH] stylo: Regenerate bindings to take into account the
 nsStyleContent cleanup.

---
 ports/geckolib/gecko_bindings/bindings.rs        |  5 ++++-
 ports/geckolib/gecko_bindings/structs_debug.rs   | 11 ++++-------
 ports/geckolib/gecko_bindings/structs_release.rs | 11 ++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

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<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
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<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)]