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

Simplify counter CSS properties

Browse source
This commit is contained in:
Anthony Ramine 2018-02-04 03:15:15 +01:00
parent 2f8cd0fe22
commit df11a7fec7
7 changed files with 120 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

76
components/style/values/computed/counters.rs
View file

@ -4,77 +4,11 @@
//! Computed values for counter properties
use values::CustomIdent;
use values::computed::{Context, ToComputedValue};
use values::generics::counters::CounterIntegerList;
use values::specified::{CounterIncrement as SpecifiedCounterIncrement, CounterReset as SpecifiedCounterReset};
type ComputedIntegerList = CounterIntegerList<i32>;
use values::generics::counters::CounterIncrement as GenericCounterIncrement;
use values::generics::counters::CounterReset as GenericCounterReset;
/// A computed value for the `counter-increment` property.
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub struct CounterIncrement(pub ComputedIntegerList);
pub type CounterIncrement = GenericCounterIncrement<i32>;
impl CounterIncrement {
/// Returns the `none` value.
#[inline]
pub fn none() -> CounterIncrement {
CounterIncrement(ComputedIntegerList::new(Vec::new()))
}
/// Returns a new computed `counter-increment` object with the given values.
pub fn new(vec: Vec<(CustomIdent, i32)>) -> CounterIncrement {
CounterIncrement(ComputedIntegerList::new(vec))
}
/// Returns the values of the computed `counter-increment` object.
pub fn get_values(&self) -> &[(CustomIdent, i32)] {
self.0.get_values()
}
}
impl ToComputedValue for SpecifiedCounterIncrement {
type ComputedValue = CounterIncrement;
fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
CounterIncrement(self.0.to_computed_value(context))
}
fn from_computed_value(computed: &Self::ComputedValue) -> Self {
SpecifiedCounterIncrement(ToComputedValue::from_computed_value(&computed.0))
}
}
/// A computed value for the `counter-reset` property.
#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss)]
pub struct CounterReset(pub ComputedIntegerList);
impl CounterReset {
/// Returns the `none` value.
#[inline]
pub fn none() -> CounterReset {
CounterReset(ComputedIntegerList::new(Vec::new()))
}
/// Returns a new computed `counter-reset` object with the given values.
pub fn new(vec: Vec<(CustomIdent, i32)>) -> CounterReset {
CounterReset(ComputedIntegerList::new(vec))
}
/// Returns the values of the computed `counter-reset` object.
pub fn get_values(&self) -> &[(CustomIdent, i32)] {
self.0.get_values()
}
}
impl ToComputedValue for SpecifiedCounterReset {
type ComputedValue = CounterReset;
fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
CounterReset(self.0.to_computed_value(context))
}
fn from_computed_value(computed: &Self::ComputedValue) -> Self {
SpecifiedCounterReset(ToComputedValue::from_computed_value(&computed.0))
}
}
/// A computed value for the `counter-increment` property.
pub type CounterReset = GenericCounterReset<i32>;