Move text-emphasis-style variables out of mako templates

components/style/properties/gecko.mako.rs

@@ -4707,14 +4707,14 @@ fn static_assert() {
 
     ${impl_simple_type_with_conversion("text_emphasis_position")}
 
-    pub fn set_text_emphasis_style(&mut self, v: longhands::text_emphasis_style::computed_value::T) {
-        use properties::longhands::text_emphasis_style::computed_value::T;
-        use properties::longhands::text_emphasis_style::{FillMode, ShapeKeyword};
+    pub fn set_text_emphasis_style(&mut self, v: values::computed::TextEmphasisStyle) {
+        use values::computed::TextEmphasisStyle;
+        use values::specified::text::{FillMode, ShapeKeyword};
 
         self.clear_text_emphasis_style_if_string();
         let (te, s) = match v {
-            T::None => (structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE, ""),
-            T::Keyword(ref keyword) => {
+            TextEmphasisStyle::None => (structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE, ""),
+            TextEmphasisStyle::Keyword(ref keyword) => {
                 let fill = match keyword.fill {
                     FillMode::Filled => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED,
                     FillMode::Open => structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN,
@@ -4729,7 +4729,7 @@ fn static_assert() {
 
                 (shape | fill, keyword.shape.char(keyword.fill))
             },
-            T::String(ref s) => {
+            TextEmphasisStyle::String(ref s) => {
                 (structs::NS_STYLE_TEXT_EMPHASIS_STYLE_STRING, &**s)
             },
         };
@@ -4750,16 +4750,17 @@ fn static_assert() {
         self.copy_text_emphasis_style_from(other)
     }
 
-    pub fn clone_text_emphasis_style(&self) -> longhands::text_emphasis_style::computed_value::T {
-        use properties::longhands::text_emphasis_style::computed_value::{T, KeywordValue};
-        use properties::longhands::text_emphasis_style::{FillMode, ShapeKeyword};
+    pub fn clone_text_emphasis_style(&self) -> values::computed::TextEmphasisStyle {
+        use values::computed::TextEmphasisStyle;
+        use values::specified::text::{FillMode, ShapeKeyword};
+        use values::computed::text::{KeywordValue};
 
         if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE as u8 {
-            return T::None;
+            return TextEmphasisStyle::None;
         }
 
         if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_STRING as u8 {
-            return T::String(self.gecko.mTextEmphasisStyleString.to_string());
+            return TextEmphasisStyle::String(self.gecko.mTextEmphasisStyleString.to_string());
         }
 
         let fill =
@@ -4777,7 +4778,7 @@ fn static_assert() {
                 _ => panic!("Unexpected value in style struct for text-emphasis-style property")
             };
 
-        T::Keyword(KeywordValue { fill, shape })
+        TextEmphasisStyle::Keyword(KeywordValue { fill, shape })
     }
 
     ${impl_non_negative_length('_webkit_text_stroke_width',

components/style/properties/longhand/inherited_text.mako.rs

@@ -195,166 +195,16 @@ ${helpers.predefined_type(
     spec="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property",
 )}
 
-<%helpers:longhand name="text-emphasis-style" products="gecko" boxed="True"
-                   animation_value_type="discrete"
-                   spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-style">
-    use computed_values::writing_mode::T as WritingMode;
-    use unicode_segmentation::UnicodeSegmentation;
-
-    pub mod computed_value {
-        #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
-        #[cfg_attr(feature = "servo", derive(ToComputedValue))]
-        pub enum T {
-            Keyword(KeywordValue),
+${helpers.predefined_type(
+    "text-emphasis-style",
+    "TextEmphasisStyle",
     None,
-            String(String),
-        }
-
-        #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
-        pub struct KeywordValue {
-            pub fill: super::FillMode,
-            pub shape: super::ShapeKeyword,
-        }
-    }
-
-    #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
-    pub enum SpecifiedValue {
-        Keyword(KeywordValue),
-        None,
-        String(String),
-    }
-
-    #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
-    pub enum KeywordValue {
-        Fill(FillMode),
-        Shape(ShapeKeyword),
-        FillAndShape(FillMode, ShapeKeyword),
-    }
-
-    impl KeywordValue {
-        fn fill(&self) -> Option<FillMode> {
-            match *self {
-                KeywordValue::Fill(fill) |
-                KeywordValue::FillAndShape(fill, _) => Some(fill),
-                _ => None,
-            }
-        }
-
-        fn shape(&self) -> Option<ShapeKeyword> {
-            match *self {
-                KeywordValue::Shape(shape) |
-                KeywordValue::FillAndShape(_, shape) => Some(shape),
-                _ => None,
-            }
-        }
-    }
-
-    #[derive(Clone, Copy, Debug, MallocSizeOf, Parse, PartialEq, ToCss)]
-    pub enum FillMode {
-        Filled,
-        Open,
-    }
-
-    #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)]
-    pub enum ShapeKeyword {
-        Dot,
-        Circle,
-        DoubleCircle,
-        Triangle,
-        Sesame,
-    }
-
-    impl ShapeKeyword {
-        pub fn char(&self, fill: FillMode) -> &str {
-            let fill = fill == FillMode::Filled;
-            match *self {
-                ShapeKeyword::Dot => if fill { "\u{2022}" } else { "\u{25e6}" },
-                ShapeKeyword::Circle =>  if fill { "\u{25cf}" } else { "\u{25cb}" },
-                ShapeKeyword::DoubleCircle =>  if fill { "\u{25c9}" } else { "\u{25ce}" },
-                ShapeKeyword::Triangle =>  if fill { "\u{25b2}" } else { "\u{25b3}" },
-                ShapeKeyword::Sesame =>  if fill { "\u{fe45}" } else { "\u{fe46}" },
-            }
-        }
-    }
-
-    #[inline]
-    pub fn get_initial_value() -> computed_value::T {
-        computed_value::T::None
-    }
-
-    #[inline]
-    pub fn get_initial_specified_value() -> SpecifiedValue {
-        SpecifiedValue::None
-    }
-
-    impl ToComputedValue for SpecifiedValue {
-        type ComputedValue = computed_value::T;
-
-        #[inline]
-        fn to_computed_value(&self, context: &Context) -> computed_value::T {
-            match *self {
-                SpecifiedValue::Keyword(ref keyword) => {
-                    let default_shape = if context.style().get_inheritedbox()
-                                                  .clone_writing_mode() == WritingMode::HorizontalTb {
-                        ShapeKeyword::Circle
-                    } else {
-                        ShapeKeyword::Sesame
-                    };
-                    computed_value::T::Keyword(computed_value::KeywordValue {
-                        fill: keyword.fill().unwrap_or(FillMode::Filled),
-                        shape: keyword.shape().unwrap_or(default_shape),
-                    })
-                },
-                SpecifiedValue::None => computed_value::T::None,
-                SpecifiedValue::String(ref s) => {
-                    // Passing `true` to iterate over extended grapheme clusters, following
-                    // recommendation at http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries
-                    let string = s.graphemes(true).next().unwrap_or("").to_string();
-                    computed_value::T::String(string)
-                }
-            }
-        }
-        #[inline]
-        fn from_computed_value(computed: &computed_value::T) -> Self {
-            match *computed {
-                computed_value::T::Keyword(ref keyword) =>
-                    SpecifiedValue::Keyword(KeywordValue::FillAndShape(keyword.fill,keyword.shape)),
-                computed_value::T::None => SpecifiedValue::None,
-                computed_value::T::String(ref string) => SpecifiedValue::String(string.clone())
-            }
-        }
-    }
-
-    pub fn parse<'i, 't>(
-        _context: &ParserContext,
-        input: &mut Parser<'i, 't>,
-    ) -> Result<SpecifiedValue, ParseError<'i>> {
-        if input.try(|input| input.expect_ident_matching("none")).is_ok() {
-            return Ok(SpecifiedValue::None);
-        }
-
-        if let Ok(s) = input.try(|i| i.expect_string().map(|s| s.as_ref().to_owned())) {
-            // Handle <string>
-            return Ok(SpecifiedValue::String(s));
-        }
-
-        // Handle a pair of keywords
-        let mut shape = input.try(ShapeKeyword::parse).ok();
-        let fill = input.try(FillMode::parse).ok();
-        if shape.is_none() {
-            shape = input.try(ShapeKeyword::parse).ok();
-        }
-
-        // At least one of shape or fill must be handled
-        let keyword_value = match (fill, shape) {
-            (Some(fill), Some(shape)) => KeywordValue::FillAndShape(fill, shape),
-            (Some(fill), None) => KeywordValue::Fill(fill),
-            (None, Some(shape)) => KeywordValue::Shape(shape),
-            _ => return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)),
-        };
-        Ok(SpecifiedValue::Keyword(keyword_value))
-    }
-</%helpers:longhand>
+    initial_specified_value="SpecifiedValue::None",
+    products="gecko",
+    boxed=True,
+    animation_value_type="discrete",
+    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-style",
+)}
 
 <%helpers:longhand name="text-emphasis-position" animation_value_type="discrete" products="gecko"
                    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">

components/style/properties/shorthand/inherited_text.mako.rs

@@ -33,7 +33,7 @@
         if color.is_some() || style.is_some() {
             Ok(expanded! {
                 text_emphasis_color: unwrap_or_initial!(text_emphasis_color, color),
-                text_emphasis_style: unwrap_or_initial!(text_emphasis_style, style),
+                text_emphasis_style: unwrap_or_initial!(text_emphasis_style, style), // TODO: what?
             })
         } else {
             Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))

components/style/values/computed/mod.rs

@@ -75,7 +75,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::svg::MozContextProperties;
 pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
-pub use self::text::{TextAlign, TextOverflow, WordSpacing};
+pub use self::text::{TextAlign, TextOverflow, WordSpacing, TextEmphasisStyle};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, TimingFunction, Transform, TransformOperation};
 pub use self::transform::{TransformOrigin, TransformStyle, Translate};

components/style/values/computed/text.rs

@@ -15,7 +15,7 @@ use values::generics::text::InitialLetter as GenericInitialLetter;
 use values::generics::text::LineHeight as GenericLineHeight;
 use values::generics::text::MozTabSize as GenericMozTabSize;
 use values::generics::text::Spacing;
-use values::specified::text::{TextOverflowSide, TextDecorationLine};
+use values::specified::text::{TextOverflowSide, TextDecorationLine, FillMode, ShapeKeyword};
 
 pub use values::specified::TextAlignKeyword as TextAlign;
 
@@ -151,3 +151,16 @@ impl TextDecorationsInEffect {
 
 /// A specified value for the `-moz-tab-size` property.
 pub type MozTabSize = GenericMozTabSize<NonNegativeNumber, NonNegativeLength>;
+
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
+pub enum TextEmphasisStyle {
+    Keyword(KeywordValue),
+    None,
+    String(String),
+}
+
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
+pub struct KeywordValue {
+    pub fill: FillMode,
+    pub shape: ShapeKeyword,
+}

components/style/values/specified/mod.rs

@@ -71,7 +71,7 @@ pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
 pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::svg::MozContextProperties;
 pub use self::table::XSpan;
-pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
+pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign, TextEmphasisStyle};
 pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, TimingFunction, Transform};

components/style/values/specified/text.rs

@@ -11,7 +11,9 @@ use std::fmt::{self, Write};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
 use values::computed::{Context, ToComputedValue};
 use values::computed::text::LineHeight as ComputedLineHeight;
+use values::computed::text::TextEmphasisStyle as ComputedTextEmphasisStyle;
 use values::computed::text::TextOverflow as ComputedTextOverflow;
+use values::computed::text::KeywordValue as ComputedKeywordValue;
 use values::generics::text::InitialLetter as GenericInitialLetter;
 use values::generics::text::LineHeight as GenericLineHeight;
 use values::generics::text::MozTabSize as GenericMozTabSize;
@@ -19,6 +21,8 @@ use values::generics::text::Spacing;
 use values::specified::{AllowQuirks, Integer, NonNegativeNumber, Number};
 use values::specified::length::{FontRelativeLength, Length, LengthOrPercentage, NoCalcLength};
 use values::specified::length::{NonNegativeLength, NonNegativeLengthOrPercentage};
+use properties::longhands::writing_mode::computed_value::T as SpecifiedWritingMode;
+use unicode_segmentation::UnicodeSegmentation;
 
 /// A specified type for the `initial-letter` property.
 pub type InitialLetter = GenericInitialLetter<Number, Integer>;
@@ -420,7 +424,6 @@ pub enum TextAlign {
     /// unlike other values.
     #[cfg(feature = "gecko")]
     MozCenterOrInherit,
-
 }
 
 impl Parse for TextAlign {
@@ -515,6 +518,137 @@ impl ToComputedValue for TextAlign {
     }
 }
 
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
+#[cfg_attr(feature = "servo", derive(ToComputedValue))]
+pub enum TextEmphasisStyle {
+    Keyword(KeywordValue),
+    None,
+    String(String),
+}
+
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
+pub enum KeywordValue {
+    Fill(FillMode),
+    Shape(ShapeKeyword),
+    FillAndShape(FillMode, ShapeKeyword),
+}
+
+impl KeywordValue {
+    fn fill(&self) -> Option<FillMode> {
+        match *self {
+            KeywordValue::Fill(fill) |
+            KeywordValue::FillAndShape(fill, _) => Some(fill),
+            _ => None,
+        }
+    }
+
+    fn shape(&self) -> Option<ShapeKeyword> {
+        match *self {
+            KeywordValue::Shape(shape) |
+            KeywordValue::FillAndShape(_, shape) => Some(shape),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, MallocSizeOf, Parse, PartialEq, ToCss)]
+pub enum FillMode {
+    Filled,
+    Open,
+}
+
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)]
+pub enum ShapeKeyword {
+    Dot,
+    Circle,
+    DoubleCircle,
+    Triangle,
+    Sesame,
+}
+
+impl ShapeKeyword {
+    pub fn char(&self, fill: FillMode) -> &str {
+        let fill = fill == FillMode::Filled;
+        match *self {
+            ShapeKeyword::Dot => if fill { "\u{2022}" } else { "\u{25e6}" },
+            ShapeKeyword::Circle =>  if fill { "\u{25cf}" } else { "\u{25cb}" },
+            ShapeKeyword::DoubleCircle =>  if fill { "\u{25c9}" } else { "\u{25ce}" },
+            ShapeKeyword::Triangle =>  if fill { "\u{25b2}" } else { "\u{25b3}" },
+            ShapeKeyword::Sesame =>  if fill { "\u{fe45}" } else { "\u{fe46}" },
+        }
+    }
+}
+
+impl ToComputedValue for TextEmphasisStyle {
+    type ComputedValue = ComputedTextEmphasisStyle;
+
+    #[inline]
+    fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
+        match *self {
+            TextEmphasisStyle::Keyword(ref keyword) => {
+                let default_shape = if context.style().get_inheritedbox()
+                                                .clone_writing_mode() == SpecifiedWritingMode::HorizontalTb {
+                    ShapeKeyword::Circle
+                } else {
+                    ShapeKeyword::Sesame
+                };
+                ComputedTextEmphasisStyle::Keyword(ComputedKeywordValue {
+                    fill: keyword.fill().unwrap_or(FillMode::Filled),
+                    shape: keyword.shape().unwrap_or(default_shape),
+                })
+            },
+            TextEmphasisStyle::None => ComputedTextEmphasisStyle::None,
+            TextEmphasisStyle::String(ref s) => {
+                // Passing `true` to iterate over extended grapheme clusters, following
+                // recommendation at http://www.unicode.org/reports/tr29/#Grapheme_Cluster_Boundaries
+                let string = s.graphemes(true).next().unwrap_or("").to_string();
+                ComputedTextEmphasisStyle::String(string)
+            }
+        }
+    }
+    #[inline]
+    fn from_computed_value(computed: &Self::ComputedValue) -> Self {
+        match *computed {
+            ComputedTextEmphasisStyle::Keyword(ref keyword) =>
+                TextEmphasisStyle::Keyword(KeywordValue::FillAndShape(keyword.fill, keyword.shape)),
+            ComputedTextEmphasisStyle::None => TextEmphasisStyle::None,
+            ComputedTextEmphasisStyle::String(ref string) => TextEmphasisStyle::String(string.clone())
+        }
+    }
+}
+
+impl Parse for TextEmphasisStyle {
+    fn parse<'i, 't>(
+        _context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        if input.try(|input| input.expect_ident_matching("none")).is_ok() {
+            return Ok(TextEmphasisStyle::None);
+        }
+
+        if let Ok(s) = input.try(|i| i.expect_string().map(|s| s.as_ref().to_owned())) {
+            // Handle <string>
+            return Ok(TextEmphasisStyle::String(s));
+        }
+
+        // Handle a pair of keywords
+        let mut shape = input.try(ShapeKeyword::parse).ok();
+        let fill = input.try(FillMode::parse).ok();
+        if shape.is_none() {
+            shape = input.try(ShapeKeyword::parse).ok();
+        }
+
+        // At least one of shape or fill must be handled
+        let keyword_value = match (fill, shape) {
+            (Some(fill), Some(shape)) => KeywordValue::FillAndShape(fill, shape),
+            (Some(fill), None) => KeywordValue::Fill(fill),
+            (None, Some(shape)) => KeywordValue::Shape(shape),
+            _ => return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)),
+        };
+        Ok(TextEmphasisStyle::Keyword(keyword_value))
+    }
+}
+
 /// A specified value for the `-moz-tab-size` property.
 pub type MozTabSize = GenericMozTabSize<NonNegativeNumber, NonNegativeLength>;