From 149815ab3b4946f874fab3d77a547f3903692a54 Mon Sep 17 00:00:00 2001 From: Kristen Wright Date: Wed, 7 Nov 2018 11:56:17 -0800 Subject: [PATCH] style: Conversion from NS_STYLE_BORDER_STYLE_* macro to enum class. Converted NS_STYLE_BORDER_STYLE_* consts to enum class. Updated corresponding values to enum class. reduced BCCornerInfo struct values to fit StyleBorderStyle values inside struct. Added defaults to switches that do not fully cover all instances of StyleBorderStyle. Bug: 1460439 Reviewed-by: emilio --- components/style/properties/gecko.mako.rs | 4 +++- components/style/properties/longhands/border.mako.rs | 4 +++- components/style/properties/longhands/column.mako.rs | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 81c2f690cc2..f073e52f721 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -1516,7 +1516,9 @@ fn static_assert() { <% border_style_keyword = Keyword("border-style", - "none solid double dotted dashed hidden groove ridge inset outset") %> + "none solid double dotted dashed hidden groove ridge inset outset", + gecko_enum_prefix="StyleBorderStyle", + gecko_inexhaustive=True) %> <% skip_border_longhands = " ".join(["border-{0}-{1}".format(x.ident, y) for x in SIDES diff --git a/components/style/properties/longhands/border.mako.rs b/components/style/properties/longhands/border.mako.rs index 204c710625a..5a5cdbeb552 100644 --- a/components/style/properties/longhands/border.mako.rs +++ b/components/style/properties/longhands/border.mako.rs @@ -63,7 +63,9 @@ ${helpers.gecko_keyword_conversion( Keyword('border-style', - "none solid double dotted dashed hidden groove ridge inset outset"), + "none solid double dotted dashed hidden groove ridge inset outset", + gecko_enum_prefix="StyleBorderStyle", + gecko_inexhaustive=True), type="crate::values::specified::BorderStyle", )} diff --git a/components/style/properties/longhands/column.mako.rs b/components/style/properties/longhands/column.mako.rs index 193c13f2aa6..759960115bd 100644 --- a/components/style/properties/longhands/column.mako.rs +++ b/components/style/properties/longhands/column.mako.rs @@ -83,7 +83,8 @@ ${helpers.single_keyword( "none hidden dotted dashed solid double groove ridge inset outset", products="gecko", extra_prefixes="moz", - gecko_constant_prefix="NS_STYLE_BORDER_STYLE", + gecko_enum_prefix="StyleBorderStyle", + gecko_inexhaustive=True, animation_value_type="discrete", spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-style", )}