From 0254fd06350614e9ad521811ad189f305a5a9afe Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Mon, 11 Sep 2017 16:35:11 +0200
Subject: [PATCH] Do not use CVAS for the list-style-type property

---
 components/style/counter_style/mod.rs             | 4 ++--
 components/style/properties/longhand/list.mako.rs | 5 +----
 components/style/values/computed/mod.rs           | 1 +
 components/style/values/generics/mod.rs           | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs
index 094f14a1cdc..6bdd22d8e07 100644
--- a/components/style/counter_style/mod.rs
+++ b/components/style/counter_style/mod.rs
@@ -342,7 +342,7 @@ impl ToCss for System {
 }
 
 /// https://drafts.csswg.org/css-counter-styles/#typedef-symbol
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, ToComputedValue)]
 pub enum Symbol {
     /// <string>
     String(String),
@@ -489,7 +489,7 @@ impl Parse for Fallback {
 }
 
 /// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-symbols
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, ToComputedValue)]
 pub struct Symbols(pub Vec<Symbol>);
 
 impl Parse for Symbols {
diff --git a/components/style/properties/longhand/list.mako.rs b/components/style/properties/longhand/list.mako.rs
index 2540922ca2e..01f4b6145bf 100644
--- a/components/style/properties/longhand/list.mako.rs
+++ b/components/style/properties/longhand/list.mako.rs
@@ -33,7 +33,6 @@ ${helpers.single_keyword("list-style-position", "outside inside", animation_valu
     <%helpers:longhand name="list-style-type" animation_value_type="discrete" boxed="True"
                        spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type">
         use values::CustomIdent;
-        use values::computed::ComputedValueAsSpecified;
         use values::generics::CounterStyleOrNone;
 
         pub use self::computed_value::T as SpecifiedValue;
@@ -42,15 +41,13 @@ ${helpers.single_keyword("list-style-position", "outside inside", animation_valu
             use values::generics::CounterStyleOrNone;
 
             /// <counter-style> | <string> | none
-            #[derive(Clone, Debug, Eq, PartialEq, ToCss)]
+            #[derive(Clone, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
             pub enum T {
                 CounterStyle(CounterStyleOrNone),
                 String(String),
             }
         }
 
-        impl ComputedValueAsSpecified for SpecifiedValue {}
-
         #[cfg(feature = "gecko")]
         impl SpecifiedValue {
             /// Convert from gecko keyword to list-style-type.
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 53a7fbe74c4..268baa23deb 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -339,6 +339,7 @@ trivial_to_computed_value!(bool);
 trivial_to_computed_value!(i32);
 trivial_to_computed_value!(f32);
 trivial_to_computed_value!(BorderStyle);
+trivial_to_computed_value!(String);
 
 /// A `<number>` value.
 pub type Number = CSSFloat;
diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs
index ba39c19bd6a..0f419da0383 100644
--- a/components/style/values/generics/mod.rs
+++ b/components/style/values/generics/mod.rs
@@ -71,7 +71,7 @@ impl SymbolsType {
 ///
 /// Since wherever <counter-style> is used, 'none' is a valid value as
 /// well, we combine them into one type to make code simpler.
-#[derive(Clone, Debug, Eq, PartialEq, ToCss)]
+#[derive(Clone, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
 pub enum CounterStyleOrNone {
     /// `none`
     None,