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

Add missing 'additive-symbols' validity checks

Browse source
This commit is contained in:
Simon Sapin 2017-04-14 12:14:33 +02:00
parent 331acfaf9b
commit ade56bbe8d
2 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/style/counter_style.rs
View file

@ -234,7 +234,7 @@ counter_style_descriptors! {
"symbols" symbols / eCSSCounterDesc_Symbols: Symbols = ! "symbols" symbols / eCSSCounterDesc_Symbols: Symbols = !
/// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols /// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols
"additive-symbols" additive_symbols / eCSSCounterDesc_AdditiveSymbols: Vec<AdditiveSymbol> = ! "additive-symbols" additive_symbols / eCSSCounterDesc_AdditiveSymbols: AdditiveSymbols = !
/// https://drafts.csswg.org/css-counter-styles/#counter-style-speak-as /// https://drafts.csswg.org/css-counter-styles/#counter-style-speak-as
"speak-as" speak_as / eCSSCounterDesc_SpeakAs: SpeakAs = { "speak-as" speak_as / eCSSCounterDesc_SpeakAs: SpeakAs = {
@ -502,26 +502,50 @@ impl ToCss for Symbols {
/// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols /// https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-additive-symbols
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct AdditiveSymbol { pub struct AdditiveSymbols(pub Vec<AdditiveTuple>);
value: i32,
impl Parse for AdditiveSymbols {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
let tuples = Vec::<AdditiveTuple>::parse(context, input)?;
// FIXME maybe? https://github.com/w3c/csswg-drafts/issues/1220
if tuples.windows(2).any(|window| window[0].value <= window[1].value) {
return Err(())
}
Ok(AdditiveSymbols(tuples))
}
}
impl ToCss for AdditiveSymbols {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.0.to_css(dest)
}
}
/// <integer> && <symbol>
#[derive(Debug, Clone)]
pub struct AdditiveTuple {
value: u32,
symbol: Symbol, symbol: Symbol,
} }
impl OneOrMoreCommaSeparated for AdditiveSymbol {} impl OneOrMoreCommaSeparated for AdditiveTuple {}
impl Parse for AdditiveSymbol { impl Parse for AdditiveTuple {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
let value = input.try(|input| input.expect_integer()); let symbol = input.try(|input| Symbol::parse(context, input));
let symbol = Symbol::parse(context, input)?; let value = input.expect_integer()?;
let value = value.or_else(|()| input.expect_integer())?; if value < 0 {
Ok(AdditiveSymbol { return Err(())
value: value, }
let symbol = symbol.or_else(|()| Symbol::parse(context, input))?;
Ok(AdditiveTuple {
value: value as u32,
symbol: symbol, symbol: symbol,
}) })
} }
} }
impl ToCss for AdditiveSymbol { impl ToCss for AdditiveTuple {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
write!(dest, "{} ", self.value)?; write!(dest, "{} ", self.value)?;
self.symbol.to_css(dest) self.symbol.to_css(dest)

4
components/style/gecko/rules.rs
View file

@ -235,9 +235,9 @@ impl ToNsCssValue for counter_style::Symbols {
} }
} }
impl ToNsCssValue for Vec<counter_style::AdditiveSymbol> { impl ToNsCssValue for counter_style::AdditiveSymbols {
fn convert(&self, _nscssvalue: &mut nsCSSValue) { fn convert(&self, _nscssvalue: &mut nsCSSValue) {
debug_assert!(!self.is_empty()); debug_assert!(!self.0.is_empty());
// FIXME: add bindings for nsCSSValuePairList // FIXME: add bindings for nsCSSValuePairList
} }
} }