Bug 1576703 - Update cbindgen. r=boris

This cleans up the pattern of "Use a private dtor so that the helper functions do the right thing" by enabling it everywhere using: mozilla/cbindgen#377 It also caught some uninitialized value issues. I think they're mostly harmless since we zero-initialize our structs: https://searchfox.org/mozilla-central/rev/325c1a707819602feff736f129cb36055ba6d94f/servo/components/style/properties/gecko.mako.rs#632 And since we override the clip rect, which is the other bit of code that was failing to build with this change. Differential Revision: https://phabricator.services.mozilla.com/D43491 UltraBlame original commit: 6c3f50c6f6662291139bc292fb9dd77aa64331ee
marco-c · Oct 4, 2019 · b59b2e0 · b59b2e0
1 parent 4afff98
commit b59b2e0
Show file tree

Hide file tree

Showing 19 changed files with 83 additions and 882 deletions.
diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure
@@ -180,7 +180,7 @@ Version
 .
 9
 .
-0
+1
 '
 )
 #

diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp
@@ -2840,8 +2840,15 @@ GetFontStyle
 )
 const
 {
-StyleComputedFontStyleDescriptor
+auto
 descriptor
+=
+StyleComputedFontStyleDescriptor
+:
+:
+Normal
+(
+)
 ;
 if
 (

diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp
@@ -1193,8 +1193,15 @@ ErrorResult
 aRv
 )
 {
-StyleComputedFontStyleDescriptor
+auto
 style
+=
+StyleComputedFontStyleDescriptor
+:
+:
+Normal
+(
+)
 ;
 float
 stretch

diff --git a/layout/style/GeckoBindings.cpp b/layout/style/GeckoBindings.cpp
@@ -6317,6 +6317,17 @@ MOZ_ASSERT
 aImage
 )
 ;
+auto
+zero
+=
+StyleNumberOrPercentage
+:
+:
+Number
+(
+0
+)
+;
 aImage
 -
 >
@@ -6330,6 +6341,16 @@ nsStyleImage
 CropRect
 >
 (
+nsStyleImage
+:
+:
+CropRect
+{
+zero
+zero
+zero
+zero
+}
 )
 )
 ;

diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
@@ -2717,6 +2717,15 @@ Auto
 (
 )
 )
+mImageRegion
+(
+StyleClipRectOrAuto
+:
+:
+Auto
+(
+)
+)
 mMozListReversed
 (
 StyleMozListReversed
@@ -13857,6 +13866,33 @@ mLineClamp
 (
 0
 )
+mRotate
+(
+StyleRotate
+:
+:
+None
+(
+)
+)
+mTranslate
+(
+StyleTranslate
+:
+:
+None
+(
+)
+)
+mScale
+(
+StyleScale
+:
+:
+None
+(
+)
+)
 mBackfaceVisibility
 (
 NS_STYLE_BACKFACE_VISIBILITY_VISIBLE

diff --git a/servo/components/style/values/computed/text.rs b/servo/components/style/values/computed/text.rs
@@ -941,22 +941,6 @@ LINE_THROUGH
 result
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive

diff --git a/servo/components/style/values/generics/effects.rs b/servo/components/style/values/generics/effects.rs
@@ -74,22 +74,6 @@ GenericBoxShadow
 as
 BoxShadow
 ;
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 cfg_attr

diff --git a/servo/components/style/values/generics/grid.rs b/servo/components/style/values/generics/grid.rs
@@ -896,22 +896,6 @@ grid_line
 )
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive
@@ -1011,22 +995,6 @@ Breadth
 )
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive
@@ -2189,22 +2157,6 @@ Ok
 )
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive
@@ -3308,22 +3260,6 @@ Ok
 )
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive

diff --git a/servo/components/style/values/generics/svg.rs b/servo/components/style/values/generics/svg.rs
@@ -22,22 +22,6 @@ style_traits
 :
 ParseError
 ;
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive
@@ -96,22 +80,6 @@ GenericSVGPaintFallback
 as
 SVGPaintFallback
 ;
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 animation
@@ -219,22 +187,6 @@ Unset
 }
 }
 }
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 animation

diff --git a/servo/components/style/values/generics/transform.rs b/servo/components/style/values/generics/transform.rs
@@ -798,22 +798,6 @@ C
 u8
 )
 ]
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 pub
 enum
 GenericTransformOperation

diff --git a/servo/components/style/values/generics/url.rs b/servo/components/style/values/generics/url.rs
@@ -1,19 +1,3 @@
-/
-/
-/
-cbindgen
-:
-derive
--
-tagged
--
-enum
--
-copy
--
-constructor
-=
-true
 #
 [
 derive