mirror of
https://github.com/servo/servo.git
synced 2025-10-12 06:20:26 +01:00
This combines `style()`, `boldness()`, `stretchiness()` into a `descriptor()` method which is used when creating `FontTemplate`s for web fonts. Eventually this method will simply read font tables using skrifa. This is the first step. In addition, `family_name()` and `face_name()` are removed. They were only used for debugging and the `FontIdentifier` serves for that. On Windows, this was adding another way in which font loading could fail, without buying us very much. The path or URL to the font is more important when debugging than the names in the font tables. Closes #15103. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they should not change observable behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
294 lines
9.2 KiB
Rust
294 lines
9.2 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use std::cell::Cell;
|
|
use std::collections::HashMap;
|
|
use std::fs::File;
|
|
use std::io::prelude::*;
|
|
use std::path::PathBuf;
|
|
use std::rc::Rc;
|
|
|
|
use app_units::Au;
|
|
use gfx::font::{
|
|
fallback_font_families, FontDescriptor, FontFamilyDescriptor, FontFamilyName, FontSearchScope,
|
|
PlatformFontMethods,
|
|
};
|
|
use gfx::font_cache_thread::{FontIdentifier, FontTemplateAndWebRenderFontKey, FontTemplates};
|
|
use gfx::font_context::{FontContext, FontSource};
|
|
use gfx::font_template::{FontTemplate, FontTemplateDescriptor};
|
|
use gfx::platform::font::PlatformFont;
|
|
use servo_arc::Arc;
|
|
use servo_atoms::Atom;
|
|
use servo_url::ServoUrl;
|
|
use style::properties::longhands::font_variant_caps::computed_value::T as FontVariantCaps;
|
|
use style::properties::style_structs::Font as FontStyleStruct;
|
|
use style::values::computed::font::{
|
|
FamilyName, FontFamily, FontFamilyList, FontFamilyNameSyntax, FontSize, FontStretch, FontStyle,
|
|
FontWeight, SingleFontFamily,
|
|
};
|
|
use style::values::computed::{FontLanguageOverride, XLang};
|
|
use style::values::generics::font::LineHeight;
|
|
use webrender_api::{FontInstanceKey, FontKey, IdNamespace};
|
|
|
|
struct TestFontSource {
|
|
families: HashMap<String, FontTemplates>,
|
|
find_font_count: Rc<Cell<isize>>,
|
|
}
|
|
|
|
impl TestFontSource {
|
|
fn new() -> TestFontSource {
|
|
let mut csstest_ascii = FontTemplates::default();
|
|
Self::add_face(&mut csstest_ascii, "csstest-ascii");
|
|
|
|
let mut csstest_basic = FontTemplates::default();
|
|
Self::add_face(&mut csstest_basic, "csstest-basic-regular");
|
|
|
|
let mut fallback = FontTemplates::default();
|
|
Self::add_face(&mut fallback, "csstest-basic-regular");
|
|
|
|
let mut families = HashMap::new();
|
|
families.insert("CSSTest ASCII".to_owned(), csstest_ascii);
|
|
families.insert("CSSTest Basic".to_owned(), csstest_basic);
|
|
families.insert(fallback_font_families(None)[0].to_owned(), fallback);
|
|
|
|
TestFontSource {
|
|
families,
|
|
find_font_count: Rc::new(Cell::new(0)),
|
|
}
|
|
}
|
|
|
|
fn identifier_for_font_name(name: &str) -> FontIdentifier {
|
|
FontIdentifier::Web(Self::url_for_font_name(name))
|
|
}
|
|
|
|
fn url_for_font_name(name: &str) -> ServoUrl {
|
|
let mut path: PathBuf = [env!("CARGO_MANIFEST_DIR"), "tests", "support", "CSSTest"]
|
|
.iter()
|
|
.collect();
|
|
path.push(format!("{}.ttf", name));
|
|
ServoUrl::from_file_path(path).unwrap()
|
|
}
|
|
|
|
fn add_face(family: &mut FontTemplates, name: &str) {
|
|
let mut path: PathBuf = [env!("CARGO_MANIFEST_DIR"), "tests", "support", "CSSTest"]
|
|
.iter()
|
|
.collect();
|
|
path.push(format!("{}.ttf", name));
|
|
|
|
let file = File::open(path).unwrap();
|
|
let data: Vec<u8> = file.bytes().map(|b| b.unwrap()).collect();
|
|
let data = std::sync::Arc::new(data);
|
|
let handle = PlatformFont::new_from_data(
|
|
Self::identifier_for_font_name(name),
|
|
data.clone(),
|
|
0,
|
|
None,
|
|
)
|
|
.unwrap();
|
|
family.add_template(FontTemplate::new_web_font(
|
|
Self::url_for_font_name(name),
|
|
handle.descriptor(),
|
|
data,
|
|
));
|
|
}
|
|
}
|
|
|
|
impl FontSource for TestFontSource {
|
|
fn get_font_instance(&mut self, _key: FontKey, _size: Au) -> FontInstanceKey {
|
|
FontInstanceKey(IdNamespace(0), 0)
|
|
}
|
|
|
|
fn font_template(
|
|
&mut self,
|
|
template_descriptor: FontTemplateDescriptor,
|
|
family_descriptor: FontFamilyDescriptor,
|
|
) -> Option<FontTemplateAndWebRenderFontKey> {
|
|
self.find_font_count.set(self.find_font_count.get() + 1);
|
|
self.families
|
|
.get_mut(family_descriptor.name())
|
|
.and_then(|family| family.find_font_for_style(&template_descriptor))
|
|
.map(|template| FontTemplateAndWebRenderFontKey {
|
|
font_template: template,
|
|
font_key: FontKey(IdNamespace(0), 0),
|
|
})
|
|
}
|
|
}
|
|
|
|
fn style() -> FontStyleStruct {
|
|
let mut style = FontStyleStruct {
|
|
font_family: FontFamily::serif(),
|
|
font_style: FontStyle::NORMAL,
|
|
font_variant_caps: FontVariantCaps::Normal,
|
|
font_weight: FontWeight::normal(),
|
|
font_size: FontSize::medium(),
|
|
font_stretch: FontStretch::hundred(),
|
|
hash: 0,
|
|
font_language_override: FontLanguageOverride::normal(),
|
|
line_height: LineHeight::Normal,
|
|
_x_lang: XLang::get_initial_value(),
|
|
};
|
|
style.compute_font_hash();
|
|
style
|
|
}
|
|
|
|
fn font_family(names: Vec<&str>) -> FontFamily {
|
|
let names: Vec<SingleFontFamily> = names
|
|
.into_iter()
|
|
.map(|name| {
|
|
SingleFontFamily::FamilyName(FamilyName {
|
|
name: Atom::from(name),
|
|
syntax: FontFamilyNameSyntax::Quoted,
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
FontFamily {
|
|
families: FontFamilyList {
|
|
list: names.into_boxed_slice(),
|
|
},
|
|
is_system_font: false,
|
|
is_initial: false,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_font_group_is_cached_by_style() {
|
|
let source = TestFontSource::new();
|
|
let mut context = FontContext::new(source);
|
|
|
|
let style1 = style();
|
|
|
|
let mut style2 = style();
|
|
style2.set_font_style(FontStyle::ITALIC);
|
|
|
|
assert_eq!(
|
|
context.font_group(Arc::new(style1.clone())).as_ptr(),
|
|
context.font_group(Arc::new(style1.clone())).as_ptr(),
|
|
"the same font group should be returned for two styles with the same hash"
|
|
);
|
|
|
|
assert_ne!(
|
|
context.font_group(Arc::new(style1.clone())).as_ptr(),
|
|
context.font_group(Arc::new(style2.clone())).as_ptr(),
|
|
"different font groups should be returned for two styles with different hashes"
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn test_font_group_find_by_codepoint() {
|
|
let source = TestFontSource::new();
|
|
let count = source.find_font_count.clone();
|
|
let mut context = FontContext::new(source);
|
|
|
|
let mut style = style();
|
|
style.set_font_family(font_family(vec!["CSSTest ASCII", "CSSTest Basic"]));
|
|
|
|
let group = context.font_group(Arc::new(style));
|
|
|
|
let font = group
|
|
.borrow_mut()
|
|
.find_by_codepoint(&mut context, 'a')
|
|
.unwrap();
|
|
assert_eq!(
|
|
font.borrow().template.borrow().identifier,
|
|
TestFontSource::identifier_for_font_name("csstest-ascii")
|
|
);
|
|
assert_eq!(
|
|
count.get(),
|
|
1,
|
|
"only the first font in the list should have been loaded"
|
|
);
|
|
|
|
let font = group
|
|
.borrow_mut()
|
|
.find_by_codepoint(&mut context, 'a')
|
|
.unwrap();
|
|
assert_eq!(
|
|
font.borrow().template.borrow().identifier,
|
|
TestFontSource::identifier_for_font_name("csstest-ascii")
|
|
);
|
|
assert_eq!(
|
|
count.get(),
|
|
1,
|
|
"we shouldn't load the same font a second time"
|
|
);
|
|
|
|
let font = group
|
|
.borrow_mut()
|
|
.find_by_codepoint(&mut context, 'á')
|
|
.unwrap();
|
|
assert_eq!(
|
|
font.borrow().template.borrow().identifier,
|
|
TestFontSource::identifier_for_font_name("csstest-basic-regular")
|
|
);
|
|
assert_eq!(count.get(), 2, "both fonts should now have been loaded");
|
|
}
|
|
|
|
#[test]
|
|
fn test_font_fallback() {
|
|
let source = TestFontSource::new();
|
|
let mut context = FontContext::new(source);
|
|
|
|
let mut style = style();
|
|
style.set_font_family(font_family(vec!["CSSTest ASCII"]));
|
|
|
|
let group = context.font_group(Arc::new(style));
|
|
|
|
let font = group
|
|
.borrow_mut()
|
|
.find_by_codepoint(&mut context, 'a')
|
|
.unwrap();
|
|
assert_eq!(
|
|
font.borrow().template.borrow().identifier,
|
|
TestFontSource::identifier_for_font_name("csstest-ascii"),
|
|
"a family in the group should be used if there is a matching glyph"
|
|
);
|
|
|
|
let font = group
|
|
.borrow_mut()
|
|
.find_by_codepoint(&mut context, 'á')
|
|
.unwrap();
|
|
assert_eq!(
|
|
font.borrow().template.borrow().identifier,
|
|
TestFontSource::identifier_for_font_name("csstest-basic-regular"),
|
|
"a fallback font should be used if there is no matching glyph in the group"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_font_template_is_cached() {
|
|
let source = TestFontSource::new();
|
|
let count = source.find_font_count.clone();
|
|
let mut context = FontContext::new(source);
|
|
|
|
let mut font_descriptor = FontDescriptor {
|
|
template_descriptor: FontTemplateDescriptor {
|
|
weight: FontWeight::normal(),
|
|
stretch: FontStretch::hundred(),
|
|
style: FontStyle::normal(),
|
|
},
|
|
variant: FontVariantCaps::Normal,
|
|
pt_size: Au(10),
|
|
};
|
|
|
|
let family_descriptor =
|
|
FontFamilyDescriptor::new(FontFamilyName::from("CSSTest Basic"), FontSearchScope::Any);
|
|
|
|
let font1 = context.font(&font_descriptor, &family_descriptor).unwrap();
|
|
|
|
font_descriptor.pt_size = Au(20);
|
|
let font2 = context.font(&font_descriptor, &family_descriptor).unwrap();
|
|
|
|
assert_ne!(
|
|
font1.borrow().descriptor.pt_size,
|
|
font2.borrow().descriptor.pt_size,
|
|
"the same font should not have been returned"
|
|
);
|
|
|
|
assert_eq!(
|
|
count.get(),
|
|
1,
|
|
"we should only have fetched the template data from the cache thread once"
|
|
);
|
|
}
|