Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 06:55:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not use CVAS for the list-style-type property

Browse source
This commit is contained in:
Anthony Ramine 2017-09-11 16:35:11 +02:00
parent 7fc2c43551
commit 0254fd0635
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/counter_style/mod.rs
View file

@ -342,7 +342,7 @@ impl ToCss for System {
} }
/// https://drafts.csswg.org/css-counter-styles/#typedef-symbol /// https://drafts.csswg.org/css-counter-styles/#typedef-symbol
#[derive(Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq, ToComputedValue)]
pub enum Symbol { pub enum Symbol {
/// <string> /// <string>
String(String), String(String),
@ -489,7 +489,7 @@ impl Parse for Fallback {
} }
/// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-symbols /// 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>); pub struct Symbols(pub Vec<Symbol>);
impl Parse for Symbols { impl Parse for Symbols {

5
components/style/properties/longhand/list.mako.rs
View file

@ -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" <%helpers:longhand name="list-style-type" animation_value_type="discrete" boxed="True"
spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type"> spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type">
use values::CustomIdent; use values::CustomIdent;
use values::computed::ComputedValueAsSpecified;
use values::generics::CounterStyleOrNone; use values::generics::CounterStyleOrNone;
pub use self::computed_value::T as SpecifiedValue; 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; use values::generics::CounterStyleOrNone;
/// <counter-style> | <string> | none /// <counter-style> | <string> | none
#[derive(Clone, Debug, Eq, PartialEq, ToCss)] #[derive(Clone, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
pub enum T { pub enum T {
CounterStyle(CounterStyleOrNone), CounterStyle(CounterStyleOrNone),
String(String), String(String),
} }
} }
impl ComputedValueAsSpecified for SpecifiedValue {}
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
impl SpecifiedValue { impl SpecifiedValue {
/// Convert from gecko keyword to list-style-type. /// Convert from gecko keyword to list-style-type.

1
components/style/values/computed/mod.rs
View file

@ -339,6 +339,7 @@ trivial_to_computed_value!(bool);
trivial_to_computed_value!(i32); trivial_to_computed_value!(i32);
trivial_to_computed_value!(f32); trivial_to_computed_value!(f32);
trivial_to_computed_value!(BorderStyle); trivial_to_computed_value!(BorderStyle);
trivial_to_computed_value!(String);
/// A `<number>` value. /// A `<number>` value.
pub type Number = CSSFloat; pub type Number = CSSFloat;

2
components/style/values/generics/mod.rs
View file

@ -71,7 +71,7 @@ impl SymbolsType {
/// ///
/// Since wherever <counter-style> is used, 'none' is a valid value as /// Since wherever <counter-style> is used, 'none' is a valid value as
/// well, we combine them into one type to make code simpler. /// 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 { pub enum CounterStyleOrNone {
/// `none` /// `none`
None, None,