stylo: Update transform-box glue.

servo · Mar 17, 2017 · 6ccbf49 · 6ccbf49
1 parent e8d8b99
commit 6ccbf49
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
@@ -711,9 +711,6 @@ pub mod root {
     pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 16;
     pub const NS_STYLE_TOP_LAYER_NONE: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_TOP_LAYER_TOP: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_TRANSFORM_BOX_BORDER_BOX: ::std::os::raw::c_uint = 0;
-    pub const NS_STYLE_TRANSFORM_BOX_FILL_BOX: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_TRANSFORM_BOX_VIEW_BOX: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE: ::std::os::raw::c_uint
               =
         0;
@@ -5965,13 +5962,13 @@ pub mod root {
         #[repr(u8)]
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub enum StyleGeometryBox {
-            Content = 0,
-            Padding = 1,
-            Border = 2,
-            Margin = 3,
-            Fill = 4,
-            Stroke = 5,
-            View = 6,
+            ContentBox = 0,
+            PaddingBox = 1,
+            BorderBox = 2,
+            MarginBox = 3,
+            FillBox = 4,
+            StrokeBox = 5,
+            ViewBox = 6,
             NoClip = 7,
             Text = 8,
             NoBox = 9,
@@ -21657,7 +21654,7 @@ pub mod root {
         pub mScrollSnapCoordinate: root::nsTArray<root::mozilla::Position>,
         pub mBackfaceVisibility: u8,
         pub mTransformStyle: u8,
-        pub mTransformBox: u8,
+        pub mTransformBox: root::nsStyleDisplay_StyleGeometryBox,
         pub mSpecifiedTransform: root::RefPtr<root::nsCSSValueSharedList>,
         pub mTransformOrigin: [root::nsStyleCoord; 3usize],
         pub mChildPerspective: root::nsStyleCoord,
@@ -21679,6 +21676,8 @@ pub mod root {
         pub mAnimationIterationCountCount: u32,
         pub mShapeOutside: root::mozilla::StyleShapeSource,
     }
+    pub use self::super::root::mozilla::StyleGeometryBox as
+            nsStyleDisplay_StyleGeometryBox;
     #[test]
     fn bindgen_test_layout_nsStyleDisplay() {
         assert_eq!(::std::mem::size_of::<nsStyleDisplay>() , 416usize , concat

diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
@@ -711,9 +711,6 @@ pub mod root {
     pub const NS_STYLE_TOUCH_ACTION_MANIPULATION: ::std::os::raw::c_uint = 16;
     pub const NS_STYLE_TOP_LAYER_NONE: ::std::os::raw::c_uint = 0;
     pub const NS_STYLE_TOP_LAYER_TOP: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_TRANSFORM_BOX_BORDER_BOX: ::std::os::raw::c_uint = 0;
-    pub const NS_STYLE_TRANSFORM_BOX_FILL_BOX: ::std::os::raw::c_uint = 1;
-    pub const NS_STYLE_TRANSFORM_BOX_VIEW_BOX: ::std::os::raw::c_uint = 2;
     pub const NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE: ::std::os::raw::c_uint
               =
         0;
@@ -5804,13 +5801,13 @@ pub mod root {
         #[repr(u8)]
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub enum StyleGeometryBox {
-            Content = 0,
-            Padding = 1,
-            Border = 2,
-            Margin = 3,
-            Fill = 4,
-            Stroke = 5,
-            View = 6,
+            ContentBox = 0,
+            PaddingBox = 1,
+            BorderBox = 2,
+            MarginBox = 3,
+            FillBox = 4,
+            StrokeBox = 5,
+            ViewBox = 6,
             NoClip = 7,
             Text = 8,
             NoBox = 9,
@@ -21016,7 +21013,7 @@ pub mod root {
         pub mScrollSnapCoordinate: root::nsTArray<root::mozilla::Position>,
         pub mBackfaceVisibility: u8,
         pub mTransformStyle: u8,
-        pub mTransformBox: u8,
+        pub mTransformBox: root::nsStyleDisplay_StyleGeometryBox,
         pub mSpecifiedTransform: root::RefPtr<root::nsCSSValueSharedList>,
         pub mTransformOrigin: [root::nsStyleCoord; 3usize],
         pub mChildPerspective: root::nsStyleCoord,
@@ -21038,6 +21035,8 @@ pub mod root {
         pub mAnimationIterationCountCount: u32,
         pub mShapeOutside: root::mozilla::StyleShapeSource,
     }
+    pub use self::super::root::mozilla::StyleGeometryBox as
+            nsStyleDisplay_StyleGeometryBox;
     #[test]
     fn bindgen_test_layout_nsStyleDisplay() {
         assert_eq!(::std::mem::size_of::<nsStyleDisplay>() , 416usize , concat

diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
@@ -1807,6 +1807,7 @@ ${helpers.single_keyword("backface-visibility",
 
 ${helpers.single_keyword("transform-box",
                          "border-box fill-box view-box",
+                         gecko_enum_prefix="StyleGeometryBox",
                          products="gecko",
                          spec="https://drafts.csswg.org/css-transforms/#transform-box",
                          animatable=False)}