Auto merge of #20495 - LiHaoTan:move-text-emphasis-position, r=emilio

Move `text-emphasis-position` outside of mako

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` and `./mach build-geckolib` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fixes #19961

- [X] These changes do not require tests because this is refactoring.

~Just as a sanity check I ran `./mach test-wpt tests/wpt/web-platform-tests/css/css-text-decor/text-emphasis-position-above-left-001.xht` though I'm not sure if I'm correct since we are also building for `geckolib`. I guess the buildbot will make sure to run all the relevant tests anyway.~ I guess Travis and AppVeyor will run the web platform tests before the buildbot run all the tests later on.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20495)
<!-- Reviewable:end -->

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

@@ -206,93 +206,15 @@ ${helpers.predefined_type(
     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">
-    #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq)]
-    #[derive(ToComputedValue, ToCss)]
-    pub enum HorizontalWritingModeValue {
-        Over,
-        Under,
-    }
-
-    #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq)]
-    #[derive(ToComputedValue, ToCss)]
-    pub enum VerticalWritingModeValue {
-        Right,
-        Left,
-    }
-
-    #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToCss)]
-    pub struct SpecifiedValue(pub HorizontalWritingModeValue, pub VerticalWritingModeValue);
-
-    pub mod computed_value {
-        pub type T = super::SpecifiedValue;
-    }
-
-    pub fn get_initial_value() -> computed_value::T {
-        SpecifiedValue(HorizontalWritingModeValue::Over, VerticalWritingModeValue::Right)
-    }
-
-    pub fn parse<'i, 't>(_context: &ParserContext, input: &mut Parser<'i, 't>)
-                         -> Result<SpecifiedValue, ParseError<'i>> {
-       if let Ok(horizontal) = input.try(|input| HorizontalWritingModeValue::parse(input)) {
-            let vertical = VerticalWritingModeValue::parse(input)?;
-            Ok(SpecifiedValue(horizontal, vertical))
-        } else {
-            let vertical = VerticalWritingModeValue::parse(input)?;
-            let horizontal = HorizontalWritingModeValue::parse(input)?;
-            Ok(SpecifiedValue(horizontal, vertical))
-        }
-    }
-
-    % if product == "gecko":
-        impl SpecifiedValue {
-            pub fn from_gecko_keyword(kw: u32) -> Self {
-                use gecko_bindings::structs;
-
-                let vert = if kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT != 0 {
-                    VerticalWritingModeValue::Right
-                } else {
-                    debug_assert!(kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT != 0);
-                    VerticalWritingModeValue::Left
-                };
-                let horiz = if kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_OVER != 0 {
-                    HorizontalWritingModeValue::Over
-                } else {
-                    debug_assert!(kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER != 0);
-                    HorizontalWritingModeValue::Under
-                };
-                SpecifiedValue(horiz, vert)
-            }
-        }
-
-        impl From<u8> for SpecifiedValue {
-            fn from(bits: u8) -> SpecifiedValue {
-                SpecifiedValue::from_gecko_keyword(bits as u32)
-            }
-        }
-
-        impl From<SpecifiedValue> for u8 {
-            fn from(v: SpecifiedValue) -> u8 {
-                use gecko_bindings::structs;
-
-                let mut result = match v.0 {
-                    HorizontalWritingModeValue::Over => structs::NS_STYLE_TEXT_EMPHASIS_POSITION_OVER,
-                    HorizontalWritingModeValue::Under => structs::NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER,
-                };
-                match v.1 {
-                    VerticalWritingModeValue::Right => {
-                        result |= structs::NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT;
-                    }
-                    VerticalWritingModeValue::Left => {
-                        result |= structs::NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT;
-                    }
-                };
-                result as u8
-            }
-        }
-    % endif
-</%helpers:longhand>
+${helpers.predefined_type(
+    "text-emphasis-position",
+    "TextEmphasisPosition",
+    "computed::TextEmphasisPosition::over_right()",
+    initial_specified_value="specified::TextEmphasisPosition::over_right()",
+    products="gecko",
+    animation_value_type="discrete",
+    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position",
+)}
 
 ${helpers.predefined_type(
     "text-emphasis-color",

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, TextEmphasisStyle, TextOverflow, WordSpacing};
+pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle, TextOverflow, WordSpacing};
 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

@@ -18,6 +18,7 @@ use values::generics::text::Spacing;
 use values::specified::text::{TextDecorationLine, TextEmphasisFillMode, TextEmphasisShapeKeyword, TextOverflowSide};
 
 pub use values::specified::TextAlignKeyword as TextAlign;
+pub use values::specified::TextEmphasisPosition;
 
 /// A computed value for the `initial-letter` property.
 pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>;

components/style/values/specified/mod.rs

@@ -71,7 +71,8 @@ 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, TextEmphasisStyle};
+pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
+pub use self::text::{TextEmphasisStyle, TextEmphasisPosition};
 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

@@ -666,6 +666,106 @@ impl Parse for TextEmphasisStyle {
     }
 }
 
+/// The allowed horizontal values for the `text-emphasis-position` property.
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq)]
+#[derive(ToComputedValue, ToCss)]
+pub enum TextEmphasisHorizontalWritingModeValue {
+    /// Draw marks over the text in horizontal writing mode.
+    Over,
+    /// Draw marks under the text in horizontal writing mode.
+    Under,
+}
+
+/// The allowed vertical values for the `text-emphasis-position` property.
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq)]
+#[derive(ToComputedValue, ToCss)]
+pub enum TextEmphasisVerticalWritingModeValue {
+    /// Draws marks to the right of the text in vertical writing mode.
+    Right,
+    /// Draw marks to the left of the text in vertical writing mode.
+    Left,
+}
+
+/// Specified value of `text-emphasis-position` property.
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToCss)]
+pub struct TextEmphasisPosition(
+    pub TextEmphasisHorizontalWritingModeValue,
+    pub TextEmphasisVerticalWritingModeValue
+);
+
+impl TextEmphasisPosition {
+    #[inline]
+    /// Returns the initial value of `text-emphasis-position`
+    pub fn over_right() -> Self {
+        TextEmphasisPosition(TextEmphasisHorizontalWritingModeValue::Over,
+                             TextEmphasisVerticalWritingModeValue::Right)
+    }
+
+    #[cfg(feature = "gecko")]
+    /// Converts an enumerated value coming from Gecko to a `TextEmphasisPosition`.
+    pub fn from_gecko_keyword(kw: u32) -> Self {
+        use gecko_bindings::structs;
+
+        let vert = if kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT != 0 {
+            TextEmphasisVerticalWritingModeValue::Right
+        } else {
+            debug_assert!(kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT != 0);
+            TextEmphasisVerticalWritingModeValue::Left
+        };
+        let horiz = if kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_OVER != 0 {
+            TextEmphasisHorizontalWritingModeValue::Over
+        } else {
+            debug_assert!(kw & structs::NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER != 0);
+            TextEmphasisHorizontalWritingModeValue::Under
+        };
+        TextEmphasisPosition(horiz, vert)
+    }
+}
+
+impl Parse for TextEmphasisPosition {
+    fn parse<'i, 't>(
+        _context: &ParserContext,
+        input: &mut Parser<'i, 't>
+    ) -> Result<Self, ParseError<'i>> {
+        if let Ok(horizontal) = input.try(|input| TextEmphasisHorizontalWritingModeValue::parse(input)) {
+            let vertical = TextEmphasisVerticalWritingModeValue::parse(input)?;
+            Ok(TextEmphasisPosition(horizontal, vertical))
+        } else {
+            let vertical = TextEmphasisVerticalWritingModeValue::parse(input)?;
+            let horizontal = TextEmphasisHorizontalWritingModeValue::parse(input)?;
+            Ok(TextEmphasisPosition(horizontal, vertical))
+        }
+    }
+}
+
+#[cfg(feature = "gecko")]
+impl From<u8> for TextEmphasisPosition {
+    fn from(bits: u8) -> Self {
+        TextEmphasisPosition::from_gecko_keyword(bits as u32)
+    }
+}
+
+#[cfg(feature = "gecko")]
+impl From<TextEmphasisPosition> for u8 {
+    fn from(v: TextEmphasisPosition) -> u8 {
+        use gecko_bindings::structs;
+
+        let mut result = match v.0 {
+            TextEmphasisHorizontalWritingModeValue::Over => structs::NS_STYLE_TEXT_EMPHASIS_POSITION_OVER,
+            TextEmphasisHorizontalWritingModeValue::Under => structs::NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER,
+        };
+        match v.1 {
+            TextEmphasisVerticalWritingModeValue::Right => {
+                result |= structs::NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT;
+            }
+            TextEmphasisVerticalWritingModeValue::Left => {
+                result |= structs::NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT;
+            }
+        };
+        result as u8
+    }
+}
+
 /// A specified value for the `-moz-tab-size` property.
 pub type MozTabSize = GenericMozTabSize<NonNegativeNumber, NonNegativeLength>;