Added derive ToCss for Content and removed manual Impl

This commit is contained in:
Nupur Baghel 2018-02-11 23:56:59 +05:30
parent 2f4362e0c1
commit 8116962298
2 changed files with 2 additions and 23 deletions

View file

@ -146,28 +146,6 @@ impl Parse for Content {
} }
} }
impl ToCss for Content {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> 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 { impl ToCss for ContentItem {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
where W: Write, where W: Write,

View file

@ -82,7 +82,7 @@ type CounterStyleType = CounterStyleOrNone;
/// The specified value for the `content` property. /// The specified value for the `content` property.
/// ///
/// https://drafts.csswg.org/css-content/#propdef-content /// 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 { pub enum Content {
/// `normal` reserved keyword. /// `normal` reserved keyword.
Normal, Normal,
@ -92,6 +92,7 @@ pub enum Content {
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
MozAltContent, MozAltContent,
/// Content items. /// Content items.
#[css(iterable)]
Items(Box<[ContentItem]>), Items(Box<[ContentItem]>),
} }