Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-13 15:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

fonts: Use IpcSharedMemory to send font data (#33530)

Browse source 
This changes modifes the way that font data is sent over IPC channels.
Instead of serializing the data or sending it via IPC byte senders, font
data is copied into shared memory and a copy of the handle is sent over
the channel.

There is also the idea of sending the file handle of the on disk data of
system fonts. This could be implemented as a further followup once there
is an abstraction in `ipc-channel` over file handles.

To accomplish this, a `FontData` abstraction is added, which also allows
caching an in-memory shared `Arc<Vec<u8>>` version of the data (neeeded
by some APIs). This could also be a place for caching font tables in the
future.

Finally, the `FontCacheThread` is renamed to the `SystemFontService`
while the proxy for this is now named `SystemFontServiceProxy`.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Martin Robinson 2024-09-25 09:31:55 +02:00 • committed by GitHub
parent 2c6d9a190f
commit ade902207f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 601 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/servo/lib.rs
View file

@ -54,7 +54,7 @@ use crossbeam_channel::{unbounded, Sender};
use embedder_traits::{EmbedderMsg, EmbedderProxy, EmbedderReceiver, EventLoopWaker};
use env_logger::Builder as EnvLoggerBuilder;
use euclid::Scale;
use fonts::FontCacheThread;
use fonts::SystemFontService;
#[cfg(all(
not(target_os = "windows"),
not(target_os = "ios"),
@ -66,7 +66,7 @@ use fonts::FontCacheThread;
use gaol::sandbox::{ChildSandbox, ChildSandboxMethods};
pub use gleam::gl;
use gleam::gl::RENDERER;
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
#[cfg(feature = "layout_2013")]
pub use layout_thread_2013;
use log::{error, trace, warn, Log, Metadata, Record};
@ -89,7 +89,6 @@ use surfman::platform::generic::multi::context::NativeContext as LinuxNativeCont
use surfman::{GLApi, GLVersion};
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
use surfman::{NativeConnection, NativeContext};
use tracing::{span, Level};
use webgpu::swapchain::WGPUImageMap;
use webrender::{RenderApiSender, ShaderPrecacheFlags, UploadMethod, ONE_TIME_USAGE_HINT};
use webrender_api::{
@ -1040,13 +1039,16 @@ fn create_constellation(
Arc::new(protocols),
);
let font_cache_thread = FontCacheThread::new(Box::new(WebRenderFontApiCompositorProxy(
compositor_proxy.clone(),
)));
let system_font_service = Arc::new(
SystemFontService::spawn(Box::new(WebRenderFontApiCompositorProxy(
compositor_proxy.clone(),
)))
.to_proxy(),
);
let (canvas_create_sender, canvas_ipc_sender) = CanvasPaintThread::start(
Box::new(CanvasWebrenderApi(compositor_proxy.clone())),
font_cache_thread.clone(),
system_font_service.clone(),
public_resource_threads.clone(),
);
@ -1055,7 +1057,7 @@ fn create_constellation(
embedder_proxy,
devtools_sender,
bluetooth_thread,
font_cache_thread,
system_font_service,
public_resource_threads,
private_resource_threads,
time_profiler_chan,
@ -1106,20 +1108,12 @@ impl WebRenderFontApi for WebRenderFontApiCompositorProxy {
receiver.recv().unwrap()
}
#[tracing::instrument(skip(self), fields(servo_profiling = true))]
fn add_font(&self, data: Arc<Vec<u8>>, index: u32) -> FontKey {
fn add_font(&self, data: Arc<IpcSharedMemory>, index: u32) -> FontKey {
let (sender, receiver) = unbounded();
let (bytes_sender, bytes_receiver) =
ipc::bytes_channel().expect("failed to create IPC channel");
self.0
.send(CompositorMsg::Forwarded(ForwardedToCompositorMsg::Font(
FontToCompositorMsg::AddFont(sender, index, bytes_receiver),
FontToCompositorMsg::AddFont(sender, index, data),
)));
{
let span = span!(Level::TRACE, "add_font send", servo_profiling = true);
let _span = span.enter();
let _ = bytes_sender.send(&data);
}
receiver.recv().unwrap()
}
@ -1134,14 +1128,14 @@ impl WebRenderFontApi for WebRenderFontApiCompositorProxy {
fn forward_add_font_message(
&self,
bytes_receiver: ipc::IpcBytesReceiver,
data: Arc<IpcSharedMemory>,
font_index: u32,
result_sender: IpcSender<FontKey>,
) {
let (sender, receiver) = unbounded();
self.0
.send(CompositorMsg::Forwarded(ForwardedToCompositorMsg::Font(
FontToCompositorMsg::AddFont(sender, font_index, bytes_receiver),
FontToCompositorMsg::AddFont(sender, font_index, data),
)));
let _ = result_sender.send(receiver.recv().unwrap());
}