mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +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
|
@ -134,7 +134,7 @@ pub struct LayoutThread {
|
|||
image_cache: Arc<dyn ImageCache>,
|
||||
|
||||
/// A per-layout FontContext managing font access.
|
||||
font_context: Arc<FontContext<SystemFontServiceProxy>>,
|
||||
font_context: Arc<FontContext>,
|
||||
|
||||
/// Is this the first reflow in this layout?
|
||||
first_reflow: Cell<bool>,
|
||||
|
@ -577,7 +577,11 @@ impl LayoutThread {
|
|||
keyword_info: KeywordInfo::medium(),
|
||||
};
|
||||
|
||||
let font_context = Arc::new(FontContext::new(system_font_service, resource_threads));
|
||||
let font_context = Arc::new(FontContext::new(
|
||||
system_font_service,
|
||||
webrender_api.clone(),
|
||||
resource_threads,
|
||||
));
|
||||
let device = Device::new(
|
||||
MediaType::screen(),
|
||||
QuirksMode::NoQuirks,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue