style: Simplify -x-span property.

Differential Revision: https://phabricator.services.mozilla.com/D42914
servo · Sep 12, 2019 · ee10699 · ee10699
1 parent 432b417
commit ee10699
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 61 deletions.
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
@@ -2296,20 +2296,7 @@ fn static_assert() {
 
 </%self:impl_trait>
 
-<%self:impl_trait style_struct_name="Table" skip_longhands="-x-span">
-    #[allow(non_snake_case)]
-    pub fn set__x_span(&mut self, v: longhands::_x_span::computed_value::T) {
-        self.gecko.mSpan = v.0
-    }
-
-    #[allow(non_snake_case)]
-    pub fn clone__x_span(&self) -> longhands::_x_span::computed_value::T {
-        longhands::_x_span::computed_value::T(
-            self.gecko.mSpan
-        )
-    }
-
-    ${impl_simple_copy('_x_span', 'mSpan')}
+<%self:impl_trait style_struct_name="Table">
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="Effects" skip_longhands="clip">

diff --git a/components/style/properties/longhands/table.mako.rs b/components/style/properties/longhands/table.mako.rs
@@ -18,8 +18,8 @@ ${helpers.single_keyword(
 
 ${helpers.predefined_type(
     "-x-span",
-    "XSpan",
-    "computed::XSpan(1)",
+    "Integer",
+    "1",
     engines="gecko",
     spec="Internal-only (for `<col span>` pres attr)",
     animation_value_type="none",

diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
@@ -75,7 +75,6 @@ pub use self::resolution::Resolution;
 pub use self::svg::MozContextProperties;
 pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
 pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
-pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight};
 pub use self::text::{OverflowWrap, TextOverflow, WordBreak, WordSpacing};
 pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle};
@@ -116,7 +115,6 @@ pub mod position;
 pub mod rect;
 pub mod resolution;
 pub mod svg;
-pub mod table;
 pub mod text;
 pub mod time;
 pub mod transform;

diff --git a/components/style/values/computed/table.rs b/components/style/values/computed/table.rs
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
@@ -78,7 +78,6 @@ pub use self::svg::MozContextProperties;
 pub use self::svg::{SVGLength, SVGOpacity, SVGPaint};
 pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::svg_path::SVGPathData;
-pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight, TextAlign};
 pub use self::text::{OverflowWrap, TextEmphasisPosition, TextEmphasisStyle, WordBreak};
 pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
@@ -122,7 +121,6 @@ pub mod resolution;
 pub mod source_size_list;
 pub mod svg;
 pub mod svg_path;
-pub mod table;
 pub mod text;
 pub mod time;
 pub mod transform;

diff --git a/components/style/values/specified/table.rs b/components/style/values/specified/table.rs