aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/style/gecko/conversions.rs28
-rw-r--r--components/style/gecko_bindings/structs_debug.rs21
-rw-r--r--components/style/gecko_bindings/structs_release.rs21
-rw-r--r--components/style/properties/gecko.mako.rs24
-rw-r--r--components/style/properties/longhand/box.mako.rs1
-rw-r--r--components/style/values/specified/basic_shape.rs42
6 files changed, 68 insertions, 69 deletions
diff --git a/components/style/gecko/conversions.rs b/components/style/gecko/conversions.rs
index 6b42c1e04bf..43c8ce3b3a3 100644
--- a/components/style/gecko/conversions.rs
+++ b/components/style/gecko/conversions.rs
@@ -439,13 +439,13 @@ pub mod basic_shape {
fn from(reference: GeometryBox) -> Self {
use gecko_bindings::structs::StyleGeometryBox::*;
match reference {
- GeometryBox::ShapeBox(ShapeBox::Content) => Content,
- GeometryBox::ShapeBox(ShapeBox::Padding) => Padding,
- GeometryBox::ShapeBox(ShapeBox::Border) => Border,
- GeometryBox::ShapeBox(ShapeBox::Margin) => Margin,
- GeometryBox::Fill => Fill,
- GeometryBox::Stroke => Stroke,
- GeometryBox::View => View,
+ GeometryBox::ShapeBox(ShapeBox::ContentBox) => ContentBox,
+ GeometryBox::ShapeBox(ShapeBox::PaddingBox) => PaddingBox,
+ GeometryBox::ShapeBox(ShapeBox::BorderBox) => BorderBox,
+ GeometryBox::ShapeBox(ShapeBox::MarginBox) => MarginBox,
+ GeometryBox::FillBox => FillBox,
+ GeometryBox::StrokeBox => StrokeBox,
+ GeometryBox::ViewBox => ViewBox,
}
}
}
@@ -457,13 +457,13 @@ pub mod basic_shape {
fn from(reference: StyleGeometryBox) -> Self {
use gecko_bindings::structs::StyleGeometryBox::*;
match reference {
- Content => GeometryBox::ShapeBox(ShapeBox::Content),
- Padding => GeometryBox::ShapeBox(ShapeBox::Padding),
- Border => GeometryBox::ShapeBox(ShapeBox::Border),
- Margin => GeometryBox::ShapeBox(ShapeBox::Margin),
- Fill => GeometryBox::Fill,
- Stroke => GeometryBox::Stroke,
- View => GeometryBox::View,
+ ContentBox => GeometryBox::ShapeBox(ShapeBox::ContentBox),
+ PaddingBox => GeometryBox::ShapeBox(ShapeBox::PaddingBox),
+ BorderBox => GeometryBox::ShapeBox(ShapeBox::BorderBox),
+ MarginBox => GeometryBox::ShapeBox(ShapeBox::MarginBox),
+ FillBox => GeometryBox::FillBox,
+ StrokeBox => GeometryBox::StrokeBox,
+ ViewBox => GeometryBox::ViewBox,
other => panic!("Unexpected StyleGeometryBox::{:?} while converting to GeometryBox", other),
}
}
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
index 0d6f563f69e..86623596cd0 100644
--- 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
index 3274a8d8837..25d56da0e1e 100644
--- 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/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index bce244dbd75..856582e924d 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -2000,13 +2000,13 @@ fn static_assert() {
use properties::longhands::${shorthand}_clip::single_value::computed_value::T;
match servo {
- T::border_box => StyleGeometryBox::Border,
- T::padding_box => StyleGeometryBox::Padding,
- T::content_box => StyleGeometryBox::Content,
+ T::border_box => StyleGeometryBox::BorderBox,
+ T::padding_box => StyleGeometryBox::PaddingBox,
+ T::content_box => StyleGeometryBox::ContentBox,
% if shorthand == "mask":
- T::fill_box => StyleGeometryBox::Fill,
- T::stroke_box => StyleGeometryBox::Stroke,
- T::view_box => StyleGeometryBox::View,
+ T::fill_box => StyleGeometryBox::FillBox,
+ T::stroke_box => StyleGeometryBox::StrokeBox,
+ T::view_box => StyleGeometryBox::ViewBox,
T::no_clip => StyleGeometryBox::NoClip,
% elif shorthand == "background":
T::text => StyleGeometryBox::Text,
@@ -2019,13 +2019,13 @@ fn static_assert() {
use properties::longhands::${shorthand}_origin::single_value::computed_value::T;
match servo {
- T::border_box => StyleGeometryBox::Border,
- T::padding_box => StyleGeometryBox::Padding,
- T::content_box => StyleGeometryBox::Content,
+ T::border_box => StyleGeometryBox::BorderBox,
+ T::padding_box => StyleGeometryBox::PaddingBox,
+ T::content_box => StyleGeometryBox::ContentBox,
% if shorthand == "mask":
- T::fill_box => StyleGeometryBox::Fill,
- T::stroke_box => StyleGeometryBox::Stroke,
- T::view_box => StyleGeometryBox::View,
+ T::fill_box => StyleGeometryBox::FillBox,
+ T::stroke_box => StyleGeometryBox::StrokeBox,
+ T::view_box => StyleGeometryBox::ViewBox,
% endif
}
</%self:simple_image_array_property>
diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
index c289b3ad41f..803e766eaee 100644
--- 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)}
diff --git a/components/style/values/specified/basic_shape.rs b/components/style/values/specified/basic_shape.rs
index 45815eb7cc7..469614a2b9f 100644
--- a/components/style/values/specified/basic_shape.rs
+++ b/components/style/values/specified/basic_shape.rs
@@ -859,9 +859,9 @@ impl ToCss for FillRule {
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[allow(missing_docs)]
pub enum GeometryBox {
- Fill,
- Stroke,
- View,
+ FillBox,
+ StrokeBox,
+ ViewBox,
ShapeBox(ShapeBox),
}
@@ -871,9 +871,9 @@ impl Parse for GeometryBox {
Ok(GeometryBox::ShapeBox(shape_box))
} else {
match_ignore_ascii_case! { &try!(input.expect_ident()),
- "fill-box" => Ok(GeometryBox::Fill),
- "stroke-box" => Ok(GeometryBox::Stroke),
- "view-box" => Ok(GeometryBox::View),
+ "fill-box" => Ok(GeometryBox::FillBox),
+ "stroke-box" => Ok(GeometryBox::StrokeBox),
+ "view-box" => Ok(GeometryBox::ViewBox),
_ => Err(())
}
}
@@ -883,9 +883,9 @@ impl Parse for GeometryBox {
impl ToCss for GeometryBox {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self {
- GeometryBox::Fill => dest.write_str("fill-box"),
- GeometryBox::Stroke => dest.write_str("stroke-box"),
- GeometryBox::View => dest.write_str("view-box"),
+ GeometryBox::FillBox => dest.write_str("fill-box"),
+ GeometryBox::StrokeBox => dest.write_str("stroke-box"),
+ GeometryBox::ViewBox => dest.write_str("view-box"),
GeometryBox::ShapeBox(s) => s.to_css(dest),
}
}
@@ -898,20 +898,20 @@ impl ComputedValueAsSpecified for GeometryBox {}
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[allow(missing_docs)]
pub enum ShapeBox {
- Margin,
+ MarginBox,
// https://drafts.csswg.org/css-backgrounds-3/#box
- Border,
- Padding,
- Content,
+ BorderBox,
+ PaddingBox,
+ ContentBox,
}
impl Parse for ShapeBox {
fn parse(_context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
match_ignore_ascii_case! { &try!(input.expect_ident()),
- "margin-box" => Ok(ShapeBox::Margin),
- "border-box" => Ok(ShapeBox::Border),
- "padding-box" => Ok(ShapeBox::Padding),
- "content-box" => Ok(ShapeBox::Content),
+ "margin-box" => Ok(ShapeBox::MarginBox),
+ "border-box" => Ok(ShapeBox::BorderBox),
+ "padding-box" => Ok(ShapeBox::PaddingBox),
+ "content-box" => Ok(ShapeBox::ContentBox),
_ => Err(())
}
}
@@ -920,10 +920,10 @@ impl Parse for ShapeBox {
impl ToCss for ShapeBox {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self {
- ShapeBox::Margin => dest.write_str("margin-box"),
- ShapeBox::Border => dest.write_str("border-box"),
- ShapeBox::Padding => dest.write_str("padding-box"),
- ShapeBox::Content => dest.write_str("content-box"),
+ ShapeBox::MarginBox => dest.write_str("margin-box"),
+ ShapeBox::BorderBox => dest.write_str("border-box"),
+ ShapeBox::PaddingBox => dest.write_str("padding-box"),
+ ShapeBox::ContentBox => dest.write_str("content-box"),
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 12:59:04 +0000