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

style: Avoid serializing the counter type in counter functions if it's decimal.

Browse source 
See https://github.com/w3c/web-platform-tests/pull/9862 and such.
This commit is contained in:
Emilio Cobos Álvarez 2018-03-07 03:14:53 +01:00
parent daaee046b3
commit 839eda000a
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/style/values/specified/counters.rs
View file

@ -76,9 +76,22 @@ fn parse_counters<'i, 't>(
#[cfg(feature = "servo")]
type CounterStyleType = ListStyleType;
#[cfg(feature = "gecko")]
type CounterStyleType = CounterStyleOrNone;
#[cfg(feature = "servo")]
#[inline]
fn is_decimal(counter_type: &CounterStyleType) -> bool {
*counter_type == ListStyleType::Decimal
}
#[cfg(feature = "gecko")]
#[inline]
fn is_decimal(counter_type: &CounterStyleType) -> bool {
*counter_type == CounterStyleOrNone::decimal()
}
/// The specified value for the `content` property.
///
/// https://drafts.csswg.org/css-content/#propdef-content
@ -102,10 +115,10 @@ pub enum ContentItem {
String(Box<str>),
/// `counter(name, style)`.
#[css(comma, function)]
Counter(CustomIdent, CounterStyleType),
Counter(CustomIdent, #[css(skip_if = "is_decimal")] CounterStyleType),
/// `counters(name, separator, style)`.
#[css(comma, function)]
Counters(CustomIdent, Box<str>, CounterStyleType),
Counters(CustomIdent, Box<str>, #[css(skip_if = "is_decimal")] CounterStyleType),
/// `open-quote`.
OpenQuote,
/// `close-quote`.