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

canvas: Port CanvasMsg channel to generic channel (#39348)

Browse source 
Additionally also improve the warning message if the routed receiver
disconnects and exit the thread.
If the routed receiver disconnects, we can't receive any canvas messages
anymore, and any control messages can't remedy that, so we might as well
exit.

Testing: Channel changes are covered by existing tests. Exiting the
canvas thread if the routed thread disconnects is not tested, and needs
reviewer attention.
Part of https://github.com/servo/servo/issues/38912

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-09-18 08:06:08 +08:00 • committed by GitHub
parent 76645e5e26
commit 666b17a9a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/canvas/canvas_paint_thread.rs
View file

@ -5,14 +5,13 @@
use std::borrow::ToOwned;
use std::{f32, thread};
use base::Epoch;
use base::generic_channel::GenericSender;
use base::{Epoch, generic_channel};
use canvas_traits::ConstellationCanvasMsg;
use canvas_traits::canvas::*;
use compositing_traits::CrossProcessCompositorApi;
use crossbeam_channel::{Sender, select, unbounded};
use euclid::default::{Rect, Size2D, Transform2D};
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::router::ROUTER;
use log::warn;
use pixels::Snapshot;
use rustc_hash::FxHashMap;
@ -39,9 +38,9 @@ impl CanvasPaintThread {
/// communicate with it.
pub fn start(
compositor_api: CrossProcessCompositorApi,
) -> (Sender<ConstellationCanvasMsg>, IpcSender<CanvasMsg>) {
let (ipc_sender, ipc_receiver) = ipc::channel::<CanvasMsg>().unwrap();
let msg_receiver = ROUTER.route_ipc_receiver_to_new_crossbeam_receiver(ipc_receiver);
) -> (Sender<ConstellationCanvasMsg>, GenericSender<CanvasMsg>) {
let (ipc_sender, ipc_receiver) = generic_channel::channel::<CanvasMsg>().unwrap();
let msg_receiver = ipc_receiver.route_preserving_errors();
let (create_sender, create_receiver) = unbounded();
thread::Builder::new()
.name("Canvas".to_owned())
@ -52,17 +51,21 @@ impl CanvasPaintThread {
select! {
recv(msg_receiver) -> msg => {
match msg {
Ok(CanvasMsg::Canvas2d(message, canvas_id)) => {
Ok(Ok(CanvasMsg::Canvas2d(message, canvas_id))) => {
canvas_paint_thread.process_canvas_2d_message(message, canvas_id);
},
Ok(CanvasMsg::Close(canvas_id)) => {
Ok(Ok(CanvasMsg::Close(canvas_id))) => {
canvas_paint_thread.canvases.remove(&canvas_id);
},
Ok(CanvasMsg::Recreate(size, canvas_id)) => {
Ok(Ok(CanvasMsg::Recreate(size, canvas_id))) => {
canvas_paint_thread.canvas(canvas_id).recreate(size);
},
Err(e) => {
warn!("Error on CanvasPaintThread receive ({})", e);
Ok(Err(e)) => {
warn!("CanvasPaintThread message deserialization error: {e:?}");
}
Err(_disconnected) => {
warn!("CanvasMsg receiver disconnected");
break;
},
}
}

8
components/constellation/constellation.rs
View file

@ -451,7 +451,7 @@ pub struct Constellation<STF, SWF> {
webxr_registry: Option<webxr_api::Registry>,
/// Lazily initialized channels for canvas paint thread.
canvas: OnceCell<(Sender<ConstellationCanvasMsg>, IpcSender<CanvasMsg>)>,
canvas: OnceCell<(Sender<ConstellationCanvasMsg>, GenericSender<CanvasMsg>)>,
/// Navigation requests from script awaiting approval from the embedder.
pending_approval_navigations: PendingApprovalNavigations,
@ -4495,7 +4495,7 @@ where
fn handle_create_canvas_paint_thread_msg(
&mut self,
size: UntypedSize2D<u64>,
response_sender: IpcSender<Option<(IpcSender<CanvasMsg>, CanvasId, ImageKey)>>,
response_sender: IpcSender<Option<(GenericSender<CanvasMsg>, CanvasId, ImageKey)>>,
) {
let (canvas_data_sender, canvas_data_receiver) = unbounded();
let (canvas_sender, canvas_ipc_sender) = self
@ -5648,7 +5648,9 @@ where
}
}
fn create_canvas_paint_thread(&self) -> (Sender<ConstellationCanvasMsg>, IpcSender<CanvasMsg>) {
fn create_canvas_paint_thread(
&self,
) -> (Sender<ConstellationCanvasMsg>, GenericSender<CanvasMsg>) {
CanvasPaintThread::start(self.compositor_proxy.cross_process_compositor_api.clone())
}
}

6
components/script/dom/canvas/2d/canvas_state.rs
View file

@ -9,6 +9,7 @@ use std::sync::Arc;
use app_units::Au;
use base::Epoch;
use base::generic_channel::GenericSender;
use canvas_traits::canvas::{
Canvas2dMsg, CanvasFont, CanvasId, CanvasMsg, CompositionOptions, CompositionOrBlending,
FillOrStrokeStyle, FillRule, GlyphAndPosition, LineCapStyle, LineJoinStyle, LineOptions,
@ -23,7 +24,7 @@ use fonts::{
ByteIndex, FontBaseline, FontContext, FontGroup, FontIdentifier, FontMetrics, FontRef,
LAST_RESORT_GLYPH_ADVANCE, ShapingFlags, ShapingOptions,
};
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::ipc;
use net_traits::image_cache::{ImageCache, ImageResponse};
use net_traits::request::CorsSettings;
use pixels::{PixelFormat, Snapshot, SnapshotAlphaMode, SnapshotPixelFormat};
@ -193,9 +194,8 @@ impl CanvasContextState {
#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
#[derive(JSTraceable, MallocSizeOf)]
pub(super) struct CanvasState {
#[ignore_malloc_size_of = "Defined in ipc-channel"]
#[no_trace]
ipc_renderer: IpcSender<CanvasMsg>,
ipc_renderer: GenericSender<CanvasMsg>,
#[no_trace]
canvas_id: CanvasId,
#[no_trace]

2
components/shared/constellation/from_script_message.rs
View file

@ -542,7 +542,7 @@ pub enum ScriptToConstellationMessage {
/// 2D canvases may use the GPU and we don't want to give untrusted content access to the GPU.)
CreateCanvasPaintThread(
UntypedSize2D<u64>,
IpcSender<Option<(IpcSender<CanvasMsg>, CanvasId, ImageKey)>>,
IpcSender<Option<(GenericSender<CanvasMsg>, CanvasId, ImageKey)>>,
),
/// Notifies the constellation that this pipeline is requesting focus.
///