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

style: Parse errors in individual @font-face src components should cause only the bad component to be dropped, not the entire descriptor

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D163810
This commit is contained in:
Jonathan Kew 2022-12-06 13:44:50 +00:00 • committed by Martin Robinson
parent d2bb508272
commit 6ea75b0646
1 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
components/style/font_face.rs
View file

@ -30,7 +30,7 @@ use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser, Parser};
use cssparser::{CowRcStr, SourceLocation};
use selectors::parser::SelectorParseErrorKind;
use std::fmt::{self, Write};
use style_traits::{Comma, CssWriter, OneOrMoreSeparated, ParseError};
use style_traits::{CssWriter, ParseError};
use style_traits::{StyleParseErrorKind, ToCss};
/// A source for a font-face rule.
@ -44,8 +44,35 @@ pub enum Source {
Local(FamilyName),
}
impl OneOrMoreSeparated for Source {
type S = Comma;
/// A list of sources for the font-face src descriptor.
#[derive(Clone, Debug, Eq, PartialEq, ToCss, ToShmem)]
#[css(comma)]
pub struct SourceList(#[css(iterable)] pub Vec<Source>);
// We can't just use OneOrMoreSeparated to derive Parse for the Source list,
// because we want to filter out components that parsed as None, then fail if no
// valid components remain. So we provide our own implementation here.
impl Parse for SourceList {
fn parse<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
// Parse the comma-separated list, then let filter_map discard any None items.
let list = input
.parse_comma_separated(|input| {
let s = input.parse_entirely(|input| Source::parse(context, input));
while input.next().is_ok() {}
Ok(s.ok())
})?
.into_iter()
.filter_map(|s| s)
.collect::<Vec<Source>>();
if list.is_empty() {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
} else {
Ok(SourceList(list))
}
}
}
/// Keywords for the font-face src descriptor's format() function.
@ -465,7 +492,7 @@ pub struct FontFace<'a>(&'a FontFaceRuleData);
#[cfg(feature = "servo")]
#[derive(Clone, Debug)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
pub struct EffectiveSources(Vec<Source>);
pub struct EffectiveSources(SourceList);
#[cfg(feature = "servo")]
impl<'a> FontFace<'a> {
@ -645,7 +672,7 @@ macro_rules! font_face_descriptors_common {
$(
if let Some(ref value) = self.$ident {
dest.write_str(concat!($name, ": "))?;
ToCss::to_css(value, &mut CssWriter::new(dest))?;
value.to_css(&mut CssWriter::new(dest))?;
dest.write_str("; ")?;
}
)*
@ -739,7 +766,7 @@ font_face_descriptors! {
"font-family" family / mFamily: FamilyName,
/// The alternative sources for this font face.
"src" sources / mSrc: Vec<Source>,
"src" sources / mSrc: SourceList,
]
optional descriptors = [
/// The style of this font face.
@ -787,7 +814,7 @@ font_face_descriptors! {
"font-family" family / mFamily: FamilyName,
/// The alternative sources for this font face.
"src" sources / mSrc: Vec<Source>,
"src" sources / mSrc: SourceList,
]
optional descriptors = [
]