diff --git a/components/style/values/computed/counters.rs b/components/style/values/computed/counters.rs index 71fecc394b04..a1b1b78740d0 100644 --- a/components/style/values/computed/counters.rs +++ b/components/style/values/computed/counters.rs @@ -146,28 +146,6 @@ impl Parse for Content { } } -impl ToCss for Content { - fn to_css(&self, dest: &mut CssWriter) -> fmt::Result - where W: Write, - { - match *self { - Content::Normal => dest.write_str("normal"), - Content::None => dest.write_str("none"), - #[cfg(feature = "gecko")] - Content::MozAltContent => dest.write_str("-moz-alt-content"), - Content::Items(ref content) => { - let mut iter = content.iter(); - iter.next().unwrap().to_css(dest)?; - for c in iter { - dest.write_str(" ")?; - c.to_css(dest)?; - } - Ok(()) - } - } - } -} - impl ToCss for ContentItem { fn to_css(&self, dest: &mut CssWriter) -> fmt::Result where W: Write, diff --git a/components/style/values/specified/counters.rs b/components/style/values/specified/counters.rs index e3ba041ee57c..4819009a8bc8 100644 --- a/components/style/values/specified/counters.rs +++ b/components/style/values/specified/counters.rs @@ -82,7 +82,7 @@ type CounterStyleType = CounterStyleOrNone; /// The specified value for the `content` property. /// /// https://drafts.csswg.org/css-content/#propdef-content -#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq, ToComputedValue)] +#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq, ToComputedValue, ToCss)] pub enum Content { /// `normal` reserved keyword. Normal, @@ -92,6 +92,7 @@ pub enum Content { #[cfg(feature = "gecko")] MozAltContent, /// Content items. + #[css(iterable)] Items(Box<[ContentItem]>), }