mirror of
https://github.com/servo/servo.git
synced 2025-10-11 22:10:18 +01:00
This change reworks the way that platform fonts are created and descriptor data is on `FontTemplate` is initialized. The main change here is that platform fonts for local font faces are always initialized using the font data loaded into memory from disk. This means that there is now only a single path for creating platform fonts. In addition, the font list is now responsible for getting the `FontTemplateDescriptor` for local `FontTemplate`s. Before the font had to be loaded into memory to get the weight, style, and width used for the descriptor. This is what fonts lists are for though, so for every platform we have that information before needing to load the font. In the future, hopefully this will allow discarding fonts before needing to load them into memory. Web fonts still get the descriptor from the platform handle, but hopefully that can be done with skrifa in the future. Thsese two fixes together allow properly loading indexed font variations on Linux machines. Before only the first variation could be instantiated. Fixes https://github.com/servo/servo/issues/13317. Fixes https://github.com/servo/servo/issues/24554. Co-authored-by: Martin Robinson <mrobinson@igalia.com> ---- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13317 and #24554 - [x] There are tests for these changes --------- Co-authored-by: Martin Robinson <mrobinson@igalia.com>
267 lines
9 KiB
Rust
267 lines
9 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::RefCell;
|
|
use std::collections::HashMap;
|
|
use std::default::Default;
|
|
use std::hash::{BuildHasherDefault, Hash, Hasher};
|
|
use std::rc::Rc;
|
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
|
|
|
use app_units::Au;
|
|
use fnv::FnvHasher;
|
|
use log::debug;
|
|
use servo_arc::Arc;
|
|
use style::computed_values::font_variant_caps::T as FontVariantCaps;
|
|
use style::properties::style_structs::Font as FontStyleStruct;
|
|
use webrender_api::{FontInstanceKey, FontKey};
|
|
|
|
use crate::font::{Font, FontDescriptor, FontFamilyDescriptor, FontGroup, FontRef};
|
|
use crate::font_cache_thread::FontTemplateAndWebRenderFontKey;
|
|
use crate::font_template::FontTemplateDescriptor;
|
|
#[cfg(target_os = "macos")]
|
|
use crate::platform::core_text_font_cache::CoreTextFontCache;
|
|
|
|
static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8; // Matches FireFox (see gfxFont.h)
|
|
|
|
/// An epoch for the font context cache. The cache is flushed if the current epoch does not match
|
|
/// this one.
|
|
static FONT_CACHE_EPOCH: AtomicUsize = AtomicUsize::new(0);
|
|
|
|
pub trait FontSource {
|
|
fn get_font_instance(&mut self, key: FontKey, size: Au) -> FontInstanceKey;
|
|
|
|
fn font_template(
|
|
&mut self,
|
|
template_descriptor: FontTemplateDescriptor,
|
|
family_descriptor: FontFamilyDescriptor,
|
|
) -> Option<FontTemplateAndWebRenderFontKey>;
|
|
}
|
|
|
|
/// The FontContext represents the per-thread/thread state necessary for
|
|
/// working with fonts. It is the public API used by the layout and
|
|
/// paint code. It talks directly to the font cache thread where
|
|
/// required.
|
|
#[derive(Debug)]
|
|
pub struct FontContext<S: FontSource> {
|
|
font_source: S,
|
|
|
|
// TODO: The font context holds a strong ref to the cached fonts
|
|
// so they will never be released. Find out a good time to drop them.
|
|
// See bug https://github.com/servo/servo/issues/3300
|
|
font_cache: HashMap<FontCacheKey, Option<FontRef>>,
|
|
font_template_cache: HashMap<FontTemplateCacheKey, Option<FontTemplateAndWebRenderFontKey>>,
|
|
|
|
font_group_cache:
|
|
HashMap<FontGroupCacheKey, Rc<RefCell<FontGroup>>, BuildHasherDefault<FnvHasher>>,
|
|
|
|
epoch: usize,
|
|
}
|
|
|
|
impl<S: FontSource> FontContext<S> {
|
|
pub fn new(font_source: S) -> FontContext<S> {
|
|
#[allow(clippy::default_constructed_unit_structs)]
|
|
FontContext {
|
|
font_source,
|
|
font_cache: HashMap::new(),
|
|
font_template_cache: HashMap::new(),
|
|
font_group_cache: HashMap::with_hasher(Default::default()),
|
|
epoch: 0,
|
|
}
|
|
}
|
|
|
|
fn expire_font_caches_if_necessary(&mut self) {
|
|
let current_epoch = FONT_CACHE_EPOCH.load(Ordering::SeqCst);
|
|
if current_epoch == self.epoch {
|
|
return;
|
|
}
|
|
|
|
self.font_cache.clear();
|
|
self.font_template_cache.clear();
|
|
self.font_group_cache.clear();
|
|
self.epoch = current_epoch
|
|
}
|
|
|
|
/// Returns a `FontGroup` representing fonts which can be used for layout, given the `style`.
|
|
/// Font groups are cached, so subsequent calls with the same `style` will return a reference
|
|
/// to an existing `FontGroup`.
|
|
pub fn font_group(&mut self, style: Arc<FontStyleStruct>) -> Rc<RefCell<FontGroup>> {
|
|
let font_size = style.font_size.computed_size().into();
|
|
self.font_group_with_size(style, font_size)
|
|
}
|
|
|
|
/// Like [`Self::font_group`], but overriding the size found in the [`FontStyleStruct`] with the given size
|
|
/// in pixels.
|
|
pub fn font_group_with_size(
|
|
&mut self,
|
|
style: Arc<FontStyleStruct>,
|
|
size: Au,
|
|
) -> Rc<RefCell<FontGroup>> {
|
|
self.expire_font_caches_if_necessary();
|
|
|
|
let cache_key = FontGroupCacheKey { size, style };
|
|
|
|
if let Some(font_group) = self.font_group_cache.get(&cache_key) {
|
|
return font_group.clone();
|
|
}
|
|
|
|
let font_group = Rc::new(RefCell::new(FontGroup::new(&cache_key.style)));
|
|
self.font_group_cache.insert(cache_key, font_group.clone());
|
|
font_group
|
|
}
|
|
|
|
/// Returns a font matching the parameters. Fonts are cached, so repeated calls will return a
|
|
/// reference to the same underlying `Font`.
|
|
pub fn font(
|
|
&mut self,
|
|
font_descriptor: &FontDescriptor,
|
|
family_descriptor: &FontFamilyDescriptor,
|
|
) -> Option<FontRef> {
|
|
self.get_font_maybe_synthesizing_small_caps(
|
|
font_descriptor,
|
|
family_descriptor,
|
|
true, /* synthesize_small_caps */
|
|
)
|
|
}
|
|
|
|
fn get_font_maybe_synthesizing_small_caps(
|
|
&mut self,
|
|
font_descriptor: &FontDescriptor,
|
|
family_descriptor: &FontFamilyDescriptor,
|
|
synthesize_small_caps: bool,
|
|
) -> Option<FontRef> {
|
|
// TODO: (Bug #3463): Currently we only support fake small-caps
|
|
// painting. We should also support true small-caps (where the
|
|
// font supports it) in the future.
|
|
let synthesized_small_caps_font =
|
|
if font_descriptor.variant == FontVariantCaps::SmallCaps && synthesize_small_caps {
|
|
let mut small_caps_descriptor = font_descriptor.clone();
|
|
small_caps_descriptor.pt_size =
|
|
font_descriptor.pt_size.scale_by(SMALL_CAPS_SCALE_FACTOR);
|
|
self.get_font_maybe_synthesizing_small_caps(
|
|
&small_caps_descriptor,
|
|
family_descriptor,
|
|
false, /* synthesize_small_caps */
|
|
)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let cache_key = FontCacheKey {
|
|
font_descriptor: font_descriptor.clone(),
|
|
family_descriptor: family_descriptor.clone(),
|
|
};
|
|
|
|
self.font_cache.get(&cache_key).cloned().unwrap_or_else(|| {
|
|
debug!(
|
|
"FontContext::font cache miss for font_descriptor={:?} family_descriptor={:?}",
|
|
font_descriptor, family_descriptor
|
|
);
|
|
|
|
let font = self
|
|
.font_template(&font_descriptor.template_descriptor, family_descriptor)
|
|
.and_then(|template_info| {
|
|
self.create_font(
|
|
template_info,
|
|
font_descriptor.to_owned(),
|
|
synthesized_small_caps_font,
|
|
)
|
|
.ok()
|
|
})
|
|
.map(|font| Rc::new(RefCell::new(font)));
|
|
|
|
self.font_cache.insert(cache_key, font.clone());
|
|
font
|
|
})
|
|
}
|
|
|
|
fn font_template(
|
|
&mut self,
|
|
template_descriptor: &FontTemplateDescriptor,
|
|
family_descriptor: &FontFamilyDescriptor,
|
|
) -> Option<FontTemplateAndWebRenderFontKey> {
|
|
let cache_key = FontTemplateCacheKey {
|
|
template_descriptor: *template_descriptor,
|
|
family_descriptor: family_descriptor.clone(),
|
|
};
|
|
|
|
self.font_template_cache.get(&cache_key).cloned().unwrap_or_else(|| {
|
|
debug!(
|
|
"FontContext::font_template cache miss for template_descriptor={:?} family_descriptor={:?}",
|
|
template_descriptor,
|
|
family_descriptor
|
|
);
|
|
|
|
let template_info = self.font_source.font_template(
|
|
*template_descriptor,
|
|
family_descriptor.clone(),
|
|
);
|
|
|
|
self.font_template_cache.insert(cache_key, template_info.clone());
|
|
template_info
|
|
})
|
|
}
|
|
|
|
/// Create a `Font` for use in layout calculations, from a `FontTemplateData` returned by the
|
|
/// cache thread and a `FontDescriptor` which contains the styling parameters.
|
|
fn create_font(
|
|
&mut self,
|
|
info: FontTemplateAndWebRenderFontKey,
|
|
descriptor: FontDescriptor,
|
|
synthesized_small_caps: Option<FontRef>,
|
|
) -> Result<Font, &'static str> {
|
|
let font_instance_key = self
|
|
.font_source
|
|
.get_font_instance(info.font_key, descriptor.pt_size);
|
|
Font::new(
|
|
info.font_template,
|
|
descriptor,
|
|
font_instance_key,
|
|
synthesized_small_caps,
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Eq, Hash, PartialEq)]
|
|
struct FontCacheKey {
|
|
font_descriptor: FontDescriptor,
|
|
family_descriptor: FontFamilyDescriptor,
|
|
}
|
|
|
|
#[derive(Debug, Eq, Hash, PartialEq)]
|
|
struct FontTemplateCacheKey {
|
|
template_descriptor: FontTemplateDescriptor,
|
|
family_descriptor: FontFamilyDescriptor,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct FontGroupCacheKey {
|
|
style: Arc<FontStyleStruct>,
|
|
size: Au,
|
|
}
|
|
|
|
impl PartialEq for FontGroupCacheKey {
|
|
fn eq(&self, other: &FontGroupCacheKey) -> bool {
|
|
self.style == other.style && self.size == other.size
|
|
}
|
|
}
|
|
|
|
impl Eq for FontGroupCacheKey {}
|
|
|
|
impl Hash for FontGroupCacheKey {
|
|
fn hash<H>(&self, hasher: &mut H)
|
|
where
|
|
H: Hasher,
|
|
{
|
|
self.style.hash.hash(hasher)
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn invalidate_font_caches() {
|
|
FONT_CACHE_EPOCH.fetch_add(1, Ordering::SeqCst);
|
|
|
|
#[cfg(target_os = "macos")]
|
|
CoreTextFontCache::clear_core_text_font_cache();
|
|
}
|