mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
fonts: Simplify FontContext
in two ways that affect the unit test (#33541)
This is done by no longer forwarding compositor-bound messages through SystemFontService and making `FontContext` non-generic: - Messages from the `FontContext` to the `Compositor` no longer need to be forwarded through the `SystemFontService`. Instead send these messages directly through the script IPC channel to the `Compositor`. - Instead of adding a mock `SystemFontServiceProxy`, simply implement a mock `SystemFontService` on the other side of an IPC channel in the `font_context` unit test. This allows making `FontContext` non-generic, greatly simplifying the code. The extra complexity moves into the unit test. These changes necessitate adding a new kind of `FontIdentifier`, `FontIdentifier::Mock` due to the fact that local fonts have platform-specific identifiers. This avoids having to pretend like the system font service can have web fonts -- which was always a bit of a hack. These two changes are combined into one PR because they both require extensive and similar chages in the font_context unit test which dependended on the details of both of them. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
1daa0b4fc7
commit
ac567645a7
25 changed files with 482 additions and 425 deletions
|
@ -11,7 +11,7 @@ use std::thread;
|
|||
|
||||
use base::id::PipelineId;
|
||||
use fnv::FnvHasher;
|
||||
use fonts::{FontContext, SystemFontServiceProxy};
|
||||
use fonts::FontContext;
|
||||
use net_traits::image_cache::{
|
||||
ImageCache, ImageCacheResult, ImageOrMetadataAvailable, UsePlaceholder,
|
||||
};
|
||||
|
@ -24,8 +24,6 @@ use style::context::{RegisteredSpeculativePainter, SharedStyleContext};
|
|||
|
||||
use crate::display_list::items::{OpaqueNode, WebRenderImageInfo};
|
||||
|
||||
pub type LayoutFontContext = FontContext<SystemFontServiceProxy>;
|
||||
|
||||
type WebrenderImageCache =
|
||||
HashMap<(ServoUrl, UsePlaceholder), WebRenderImageInfo, BuildHasherDefault<FnvHasher>>;
|
||||
|
||||
|
@ -44,7 +42,7 @@ pub struct LayoutContext<'a> {
|
|||
pub image_cache: Arc<dyn ImageCache>,
|
||||
|
||||
/// A FontContext to be used during layout.
|
||||
pub font_context: Arc<FontContext<SystemFontServiceProxy>>,
|
||||
pub font_context: Arc<FontContext>,
|
||||
|
||||
/// A cache of WebRender image info.
|
||||
pub webrender_image_cache: Arc<RwLock<WebrenderImageCache>>,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue