From 8fb1277ceddd3e04f6935a4c7a57d6047b6a8abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Wed, 13 May 2026 02:13:51 -0400 Subject: [PATCH] Default Servo live rendering to software --- crates/ely_app/src/services/servo_live.rs | 7 ++++--- .../src/services/servo_sidecar_command.rs | 16 +--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/crates/ely_app/src/services/servo_live.rs b/crates/ely_app/src/services/servo_live.rs index 56625af..666351d 100644 --- a/crates/ely_app/src/services/servo_live.rs +++ b/crates/ely_app/src/services/servo_live.rs @@ -6,9 +6,10 @@ use std::{ /// Environment variable that lets the user pick the rendering context /// kind used by the spawned sidecar. Accepted values: `software` -/// and `hardware`. macOS defaults to hardware because GPUI can now -/// present Servo's BGRA IOSurfaces directly; other platforms keep the -/// software context until they have an equivalent presenter. +/// and `hardware`. The default stays on the software context because +/// the live sidecar talks to the app over stdio; the hardware path +/// requires a transport that moves the IOSurface mach send right into +/// the receiver process. use ely_domain::SitePermissionDecision; use serde::Serialize; use thiserror::Error; diff --git a/crates/ely_app/src/services/servo_sidecar_command.rs b/crates/ely_app/src/services/servo_sidecar_command.rs index b3ecd23..5cf718e 100644 --- a/crates/ely_app/src/services/servo_sidecar_command.rs +++ b/crates/ely_app/src/services/servo_sidecar_command.rs @@ -138,12 +138,6 @@ fn rendering_context_selection(raw: Option<&str>) -> SidecarRenderingContext { } } -#[cfg(target_os = "macos")] -fn default_rendering_context() -> SidecarRenderingContext { - SidecarRenderingContext::Hardware -} - -#[cfg(not(target_os = "macos"))] fn default_rendering_context() -> SidecarRenderingContext { SidecarRenderingContext::Software } @@ -182,16 +176,8 @@ mod tests { assert_eq!(context.sidecar_features(), SOFTWARE_SIDECAR_FEATURES); } - #[cfg(target_os = "macos")] #[test] - fn macos_defaults_to_hardware_rendering_context() { - assert_eq!(rendering_context_selection(None), SidecarRenderingContext::Hardware); - assert_eq!(rendering_context_selection(Some("garbage")), SidecarRenderingContext::Hardware); - } - - #[cfg(not(target_os = "macos"))] - #[test] - fn non_macos_defaults_to_software_rendering_context() { + fn defaults_to_software_rendering_context() { assert_eq!(rendering_context_selection(None), SidecarRenderingContext::Software); assert_eq!(rendering_context_selection(Some("garbage")), SidecarRenderingContext::Software); }