From cefc622e9b3ec021d46cc816729468e996e27e82 Mon Sep 17 00:00:00 2001
From: CYBAI <cyb.ai.815@gmail.com>
Date: Fri, 27 Oct 2017 02:27:58 +0800
Subject: [PATCH] style: Move -x-text-zoom outside of mako

---
 .../style/properties/longhand/font.mako.rs    | 37 ++++---------------
 components/style/values/computed/font.rs      |  2 +
 components/style/values/computed/mod.rs       |  1 +
 components/style/values/specified/font.rs     | 20 +++++++++-
 components/style/values/specified/mod.rs      |  1 +
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/components/style/properties/longhand/font.mako.rs b/components/style/properties/longhand/font.mako.rs
index 9cf3fd1b4fd..20c0097a685 100644
--- a/components/style/properties/longhand/font.mako.rs
+++ b/components/style/properties/longhand/font.mako.rs
@@ -2239,36 +2239,13 @@ ${helpers.single_keyword("-moz-math-variant",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="-x-text-zoom" products="gecko" animation_value_type="none" internal="True"
-                   spec="Internal (not web-exposed)">
-    pub use self::computed_value::T as SpecifiedValue;
-
-    pub mod computed_value {
-        use std::fmt;
-        use style_traits::ToCss;
-
-        impl ToCss for T {
-            fn to_css<W>(&self, _: &mut W) -> fmt::Result where W: fmt::Write {
-                Ok(())
-            }
-        }
-
-        #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue)]
-        /// text-zoom. Enable if true, disable if false
-        pub struct T(pub bool);
-    }
-
-    #[inline]
-    pub fn get_initial_value() -> computed_value::T {
-        computed_value::T(true)
-    }
-
-    pub fn parse<'i, 't>(_context: &ParserContext, input: &mut Parser<'i, 't>)
-                         -> Result<SpecifiedValue, ParseError<'i>> {
-        debug_assert!(false, "Should be set directly by presentation attributes only.");
-        Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
-    }
-</%helpers:longhand>
+${helpers.predefined_type("-x-text-zoom",
+                          "XTextZoom",
+                          "computed::XTextZoom(true)",
+                          animation_value_type="none",
+                          products="gecko",
+                          internal=True,
+                          spec="Internal (not web-exposed)")}
 
 % if product == "gecko":
     pub mod system_font {
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index 08d2a584f53..8114a98d790 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -11,6 +11,8 @@ use values::animated::ToAnimatedValue;
 use values::computed::NonNegativeLength;
 use values::specified::font as specified;
 
+pub use values::specified::font::XTextZoom;
+
 #[derive(Animate, ComputeSquaredDistance, MallocSizeOf, ToAnimatedZero)]
 #[derive(Clone, Copy, Debug, PartialEq)]
 /// The computed value of font-size
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 5ca51b54f10..e99bab154c4 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -36,6 +36,7 @@ pub use self::angle::Angle;
 pub use self::background::{BackgroundSize, BackgroundRepeat};
 pub use self::border::{BorderImageSlice, BorderImageWidth, BorderImageSideWidth};
 pub use self::border::{BorderRadius, BorderCornerRadius, BorderSpacing};
+pub use self::font::XTextZoom;
 pub use self::box_::{AnimationIterationCount, AnimationName, ScrollSnapType, VerticalAlign};
 pub use self::color::{Color, ColorPropertyValue, RGBAColor};
 pub use self::effects::{BoxShadow, Filter, SimpleShadow};
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index f70ab99feed..a04dcd80c5e 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -8,9 +8,10 @@
 use Atom;
 use app_units::Au;
 use cssparser::Parser;
+use parser::{Parse, ParserContext};
 use properties::longhands::system_font::SystemFont;
 use std::fmt;
-use style_traits::{ToCss, ParseError};
+use style_traits::{ToCss, StyleParseErrorKind, ParseError};
 use values::computed::{font as computed, Context, NonNegativeLength, ToComputedValue};
 use values::specified::{LengthOrPercentage, NoCalcLength};
 use values::specified::length::FontBaseSize;
@@ -373,3 +374,20 @@ impl FontSize {
         }
     }
 }
+
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue)]
+/// text-zoom. Enable if true, disable if false
+pub struct XTextZoom(pub bool);
+
+impl Parse for XTextZoom {
+    fn parse<'i, 't>(_: &ParserContext, input: &mut Parser<'i, 't>) -> Result<XTextZoom, ParseError<'i>> {
+        debug_assert!(false, "Should be set directly by presentation attributes only.");
+        Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
+    }
+}
+
+impl ToCss for XTextZoom {
+    fn to_css<W>(&self, _: &mut W) -> fmt::Result where W: fmt::Write {
+        Ok(())
+    }
+}
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 3e68e8df4c0..fef43cbf747 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -30,6 +30,7 @@ pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, Justify
 pub use self::background::{BackgroundRepeat, BackgroundSize};
 pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth};
 pub use self::border::{BorderImageSideWidth, BorderRadius, BorderSideWidth, BorderSpacing};
+pub use self::font::XTextZoom;
 pub use self::box_::{AnimationIterationCount, AnimationName, ScrollSnapType, VerticalAlign};
 pub use self::color::{Color, ColorPropertyValue, RGBAColor};
 pub use self::effects::{BoxShadow, Filter, SimpleShadow};