servo: Merge #14158 - Regenerate bindings (from heycam:bindings-update-4); r=Manishearth
authorCameron McCormack <cam@mcc.id.au>
Wed, 09 Nov 2016 22:59:04 -0600
changeset 340121 40e28253a9b96c90a9a8331663a3663cc7bcf025
parent 340120 67fb63d1059af9c067e58381fbf4bdc648ead665
child 340122 efefb700f28d76d5e6e0a746e3ca7a2ff3a53262
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersManishearth
servo: Merge #14158 - Regenerate bindings (from heycam:bindings-update-4); r=Manishearth <!-- Please describe your changes on the following line: --> Bindings update from [the latest incubator/stylo push](https://treeherder.mozilla.org/#/jobs?repo=stylo&revision=c5170a72424e7175020506586fa775077f5307a9). r? @Manishearth --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 29a55e5cbd36e57cd1fad20898200fe2470d7db1
servo/components/style/gecko_bindings/structs_debug.rs
servo/components/style/gecko_bindings/structs_release.rs
servo/components/style/gecko_string_cache/atom_macro.rs
--- a/servo/components/style/gecko_bindings/structs_debug.rs
+++ b/servo/components/style/gecko_bindings/structs_debug.rs
@@ -5541,17 +5541,17 @@ pub struct FragmentOrElement_nsDOMSlots 
     /**
      * SMIL Overridde style rules (for SMIL animation of CSS properties)
      * @see nsIContent::GetSMILOverrideStyle
      */
     pub mSMILOverrideStyle: nsCOMPtr<nsICSSDeclaration>,
     /**
      * Holds any SMIL override style declaration for this element.
      */
-    pub mSMILOverrideStyleDeclaration: RefPtr<Declaration>,
+    pub mSMILOverrideStyleDeclaration: RefPtr<DeclarationBlock>,
     /**
      * An object implementing nsIDOMMozNamedAttrMap for this content (attributes)
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
     pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_1,
     /**
      * An object implementing the .children property for this element.
@@ -7405,16 +7405,24 @@ pub struct nsAttrName {
     pub mBits: usize,
 }
 #[test]
 fn bindgen_test_layout_nsAttrName() {
     assert_eq!(::std::mem::size_of::<nsAttrName>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsAttrName>() , 8usize);
 }
 #[repr(C)]
+#[derive(Debug, Copy)]
+pub struct DeclarationBlock {
+    pub _address: u8,
+}
+impl Clone for DeclarationBlock {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
 #[derive(Debug)]
 pub struct URLValue {
     pub _base: URLValueData,
 }
 #[test]
 fn bindgen_test_layout_URLValue() {
     assert_eq!(::std::mem::size_of::<URLValue>() , 64usize);
     assert_eq!(::std::mem::align_of::<URLValue>() , 8usize);
@@ -7554,24 +7562,16 @@ impl Clone for nsDOMTokenList {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsDOMStringMap {
     pub _address: u8,
 }
 impl Clone for nsDOMStringMap {
     fn clone(&self) -> Self { *self }
 }
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct Declaration {
-    pub _address: u8,
-}
-impl Clone for Declaration {
-    fn clone(&self) -> Self { *self }
-}
 /**
  * Interface used for handling clicks on links
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsILinkHandler {
     pub _base: nsISupports,
 }
@@ -8899,17 +8899,17 @@ pub enum nsCSSPropertyID {
     eCSSProperty_fill_opacity = 101,
     eCSSProperty_fill_rule = 102,
     eCSSProperty_filter = 103,
     eCSSProperty_flex_basis = 104,
     eCSSProperty_flex_direction = 105,
     eCSSProperty_flex_grow = 106,
     eCSSProperty_flex_shrink = 107,
     eCSSProperty_flex_wrap = 108,
-    eCSSProperty_float = 109,
+    eCSSProperty_float_ = 109,
     eCSSProperty_float_edge = 110,
     eCSSProperty_flood_color = 111,
     eCSSProperty_flood_opacity = 112,
     eCSSProperty_font_family = 113,
     eCSSProperty_font_feature_settings = 114,
     eCSSProperty_font_kerning = 115,
     eCSSProperty_font_language_override = 116,
     eCSSProperty_font_size = 117,
--- a/servo/components/style/gecko_bindings/structs_release.rs
+++ b/servo/components/style/gecko_bindings/structs_release.rs
@@ -5501,17 +5501,17 @@ pub struct FragmentOrElement_nsDOMSlots 
     /**
      * SMIL Overridde style rules (for SMIL animation of CSS properties)
      * @see nsIContent::GetSMILOverrideStyle
      */
     pub mSMILOverrideStyle: nsCOMPtr<nsICSSDeclaration>,
     /**
      * Holds any SMIL override style declaration for this element.
      */
-    pub mSMILOverrideStyleDeclaration: RefPtr<Declaration>,
+    pub mSMILOverrideStyleDeclaration: RefPtr<DeclarationBlock>,
     /**
      * An object implementing nsIDOMMozNamedAttrMap for this content (attributes)
      * @see FragmentOrElement::GetAttributes
      */
     pub mAttributeMap: RefPtr<nsDOMAttributeMap>,
     pub __bindgen_anon_1: FragmentOrElement_nsDOMSlots__bindgen_ty_1,
     /**
      * An object implementing the .children property for this element.
@@ -7363,16 +7363,24 @@ pub struct nsAttrName {
     pub mBits: usize,
 }
 #[test]
 fn bindgen_test_layout_nsAttrName() {
     assert_eq!(::std::mem::size_of::<nsAttrName>() , 8usize);
     assert_eq!(::std::mem::align_of::<nsAttrName>() , 8usize);
 }
 #[repr(C)]
+#[derive(Debug, Copy)]
+pub struct DeclarationBlock {
+    pub _address: u8,
+}
+impl Clone for DeclarationBlock {
+    fn clone(&self) -> Self { *self }
+}
+#[repr(C)]
 #[derive(Debug)]
 pub struct URLValue {
     pub _base: URLValueData,
 }
 #[test]
 fn bindgen_test_layout_URLValue() {
     assert_eq!(::std::mem::size_of::<URLValue>() , 64usize);
     assert_eq!(::std::mem::align_of::<URLValue>() , 8usize);
@@ -7511,24 +7519,16 @@ impl Clone for nsDOMTokenList {
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsDOMStringMap {
     pub _address: u8,
 }
 impl Clone for nsDOMStringMap {
     fn clone(&self) -> Self { *self }
 }
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct Declaration {
-    pub _address: u8,
-}
-impl Clone for Declaration {
-    fn clone(&self) -> Self { *self }
-}
 /**
  * Interface used for handling clicks on links
  */
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct nsILinkHandler {
     pub _base: nsISupports,
 }
@@ -8856,17 +8856,17 @@ pub enum nsCSSPropertyID {
     eCSSProperty_fill_opacity = 101,
     eCSSProperty_fill_rule = 102,
     eCSSProperty_filter = 103,
     eCSSProperty_flex_basis = 104,
     eCSSProperty_flex_direction = 105,
     eCSSProperty_flex_grow = 106,
     eCSSProperty_flex_shrink = 107,
     eCSSProperty_flex_wrap = 108,
-    eCSSProperty_float = 109,
+    eCSSProperty_float_ = 109,
     eCSSProperty_float_edge = 110,
     eCSSProperty_flood_color = 111,
     eCSSProperty_flood_opacity = 112,
     eCSSProperty_font_family = 113,
     eCSSProperty_font_feature_settings = 114,
     eCSSProperty_font_kerning = 115,
     eCSSProperty_font_language_override = 116,
     eCSSProperty_font_size = 117,
--- a/servo/components/style/gecko_string_cache/atom_macro.rs
+++ b/servo/components/style/gecko_string_cache/atom_macro.rs
@@ -5343,18 +5343,16 @@ cfg_if! {
             #[link_name = "_ZN10nsCSSProps10margin_topE"]
             pub static nsCSSProps_margin_top: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps6markerE"]
             pub static nsCSSProps_marker: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps10marker_endE"]
             pub static nsCSSProps_marker_end: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps10marker_midE"]
             pub static nsCSSProps_marker_mid: *mut nsICSSProperty;
-            #[link_name = "_ZN10nsCSSProps13marker_offsetE"]
-            pub static nsCSSProps_marker_offset: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps12marker_startE"]
             pub static nsCSSProps_marker_start: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps4maskE"]
             pub static nsCSSProps_mask: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps9mask_clipE"]
             pub static nsCSSProps_mask_clip: *mut nsICSSProperty;
             #[link_name = "_ZN10nsCSSProps14mask_compositeE"]
             pub static nsCSSProps_mask_composite: *mut nsICSSProperty;
@@ -10982,18 +10980,16 @@ cfg_if! {
             #[link_name = "?margin_top@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_margin_top: *mut nsICSSProperty;
             #[link_name = "?marker@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_marker: *mut nsICSSProperty;
             #[link_name = "?marker_end@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_marker_end: *mut nsICSSProperty;
             #[link_name = "?marker_mid@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_marker_mid: *mut nsICSSProperty;
-            #[link_name = "?marker_offset@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
-            pub static nsCSSProps_marker_offset: *mut nsICSSProperty;
             #[link_name = "?marker_start@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_marker_start: *mut nsICSSProperty;
             #[link_name = "?mask@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_mask: *mut nsICSSProperty;
             #[link_name = "?mask_clip@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_mask_clip: *mut nsICSSProperty;
             #[link_name = "?mask_composite@nsCSSProps@@2PEAVnsICSSProperty@@EA"]
             pub static nsCSSProps_mask_composite: *mut nsICSSProperty;
@@ -16621,18 +16617,16 @@ cfg_if! {
             #[link_name = "\x01?margin_top@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_margin_top: *mut nsICSSProperty;
             #[link_name = "\x01?marker@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_marker: *mut nsICSSProperty;
             #[link_name = "\x01?marker_end@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_marker_end: *mut nsICSSProperty;
             #[link_name = "\x01?marker_mid@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_marker_mid: *mut nsICSSProperty;
-            #[link_name = "\x01?marker_offset@nsCSSProps@@2PAVnsICSSProperty@@A"]
-            pub static nsCSSProps_marker_offset: *mut nsICSSProperty;
             #[link_name = "\x01?marker_start@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_marker_start: *mut nsICSSProperty;
             #[link_name = "\x01?mask@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_mask: *mut nsICSSProperty;
             #[link_name = "\x01?mask_clip@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_mask_clip: *mut nsICSSProperty;
             #[link_name = "\x01?mask_composite@nsCSSProps@@2PAVnsICSSProperty@@A"]
             pub static nsCSSProps_mask_composite: *mut nsICSSProperty;
@@ -22263,18 +22257,16 @@ macro_rules! atom {
 ("margin-top") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_margin_top as *mut _) } };
 ("marker") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_marker as *mut _) } };
 ("marker-end") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_marker_end as *mut _) } };
 ("marker-mid") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_marker_mid as *mut _) } };
-("marker-offset") =>
-  { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_marker_offset as *mut _) } };
 ("marker-start") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_marker_start as *mut _) } };
 ("mask") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_mask as *mut _) } };
 ("mask-clip") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_mask_clip as *mut _) } };
 ("mask-composite") =>
   { unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSProps_mask_composite as *mut _) } };