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

Further changes required by Servo

Browse source
This commit is contained in:
Oriol Brufau 2023-09-23 18:33:49 +02:00 • committed by Martin Robinson
parent 31b2a54164
commit 87bee1710c
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/style/font_face.rs
View file

@ -52,6 +52,7 @@ impl OneOrMoreSeparated for Source {
/// Keywords for the font-face src descriptor's format() function. /// Keywords for the font-face src descriptor's format() function.
#[derive(Clone, Copy, Debug, Eq, Parse, PartialEq, ToCss, ToShmem)] #[derive(Clone, Copy, Debug, Eq, Parse, PartialEq, ToCss, ToShmem)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[repr(u8)] #[repr(u8)]
#[allow(missing_docs)] #[allow(missing_docs)]
pub enum FontFaceSourceFormatKeyword { pub enum FontFaceSourceFormatKeyword {
@ -83,6 +84,7 @@ pub enum FontFaceSourceListComponent {
} }
#[derive(Clone, Debug, Eq, PartialEq, ToCss, ToShmem)] #[derive(Clone, Debug, Eq, PartialEq, ToCss, ToShmem)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[repr(u8)] #[repr(u8)]
#[allow(missing_docs)] #[allow(missing_docs)]
pub enum FontFaceSourceFormat { pub enum FontFaceSourceFormat {
@ -359,8 +361,20 @@ impl<'a> FontFace<'a> {
// We support only opentype fonts and truetype is an alias for // We support only opentype fonts and truetype is an alias for
// that format. Sources without format hints need to be // that format. Sources without format hints need to be
// downloaded in case we support them. // downloaded in case we support them.
url_source.format_hint.as_ref().map_or(true, url_source
|hint| hint == "truetype" || hint == "opentype" || hint == "woff") .format_hint
.as_ref()
.map_or(true, |hint| match hint {
FontFaceSourceFormat::Keyword(
FontFaceSourceFormatKeyword::Truetype
| FontFaceSourceFormatKeyword::Opentype
| FontFaceSourceFormatKeyword::Woff,
) => true,
FontFaceSourceFormat::String(s) => {
s == "truetype" || s == "opentype" || s == "woff"
}
_ => false,
})
} else { } else {
true true
} }