From 811696229865f7544d51a4479f594b07faf104c0 Mon Sep 17 00:00:00 2001
From: Nupur Baghel <nupurbaghel@gmail.com>
Date: Sun, 11 Feb 2018 23:56:59 +0530
Subject: [PATCH] Added derive ToCss for Content and removed manual Impl

---
 components/style/values/computed/counters.rs  | 22 -------------------
 components/style/values/specified/counters.rs |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/components/style/values/computed/counters.rs b/components/style/values/computed/counters.rs
index 71fecc394b0..a1b1b78740d 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<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 {
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
         where W: Write,
diff --git a/components/style/values/specified/counters.rs b/components/style/values/specified/counters.rs
index e3ba041ee57..4819009a8bc 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]>),
 }