diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index dc0ceceefa1..7739014410e 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -2296,20 +2296,7 @@ fn static_assert() { -<%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 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 index 4475faaee37..0564942fc0a 100644 --- 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 `` pres attr)", animation_value_type="none", diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index d5a61746675..a565fc5f93b 100644 --- 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 deleted file mode 100644 index 22d09447ba9..00000000000 --- a/components/style/values/computed/table.rs +++ /dev/null @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -//! Computed types for table properties. - -pub use crate::values::specified::table::XSpan; diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index 16897043da9..ddb890ba395 100644 --- 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 deleted file mode 100644 index 2caace07eb3..00000000000 --- a/components/style/values/specified/table.rs +++ /dev/null @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -//! Specified types for table properties. - -use crate::parser::{Parse, ParserContext}; -use cssparser::Parser; -use style_traits::{ParseError, StyleParseErrorKind}; - -#[derive( - Clone, - Copy, - Debug, - MallocSizeOf, - PartialEq, - SpecifiedValueInfo, - ToComputedValue, - ToCss, - ToResolvedValue, - ToShmem, -)] -/// span. for `` pres attr -pub struct XSpan(#[css(skip)] pub i32); - -impl Parse for XSpan { - // never parse it, only set via presentation attribute - fn parse<'i, 't>( - _: &ParserContext, - input: &mut Parser<'i, 't>, - ) -> Result> { - Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)) - } -}