Merge remote-tracking branch 'origin/main' into webview-permission-origin
This commit is contained in:
+47
-3
@@ -1130,9 +1130,9 @@ pub fn run() {
|
||||
// Tauri's default WebView2 args (setting this overrides them) and
|
||||
// appends the Chromium background-throttling disables. Windows-only
|
||||
// in effect; harmless elsewhere. Does not block system sleep.
|
||||
.additional_browser_args(
|
||||
"--disable-features=msWebOOUI,msPdfOOUI --disable-background-timer-throttling --disable-renderer-backgrounding --disable-backgrounding-occluded-windows",
|
||||
)
|
||||
.additional_browser_args(&webview2_browser_args(
|
||||
std::env::var("LOTUS_WEBVIEW2_DEBUG_PORT").ok().as_deref(),
|
||||
))
|
||||
.on_page_load(move |window, payload| {
|
||||
if matches!(payload.event(), PageLoadEvent::Finished) {
|
||||
// Reveal only on the FIRST settle: later page loads (e.g. a
|
||||
@@ -1355,6 +1355,50 @@ pub fn run() {
|
||||
.expect("error while building tauri application");
|
||||
}
|
||||
|
||||
/// WebView2 browser arguments. Setting them replaces Tauri's defaults, so
|
||||
/// they're kept, plus the Chromium background-throttling disables (P5-42).
|
||||
///
|
||||
/// cinny-desktop #19: `LOTUS_WEBVIEW2_DEBUG_PORT=<port>` in the environment
|
||||
/// opens WebView2's DevTools port on localhost so the Windows smoke test can
|
||||
/// drive the installed app, and gives it Chromium's fake capture devices (the
|
||||
/// CI VM has no microphone; permission requests still go through the app's
|
||||
/// real PermissionRequested handler). WebView2's own
|
||||
/// `WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS` doesn't apply because the app sets
|
||||
/// its arguments explicitly. Off unless the variable holds a valid port; only
|
||||
/// whoever launches the app can set it.
|
||||
pub(crate) fn webview2_browser_args(debug_port: Option<&str>) -> String {
|
||||
let mut args = String::from(
|
||||
"--disable-features=msWebOOUI,msPdfOOUI --disable-background-timer-throttling --disable-renderer-backgrounding --disable-backgrounding-occluded-windows",
|
||||
);
|
||||
if let Some(port) = debug_port
|
||||
.and_then(|p| p.trim().parse::<u16>().ok())
|
||||
.filter(|p| *p >= 1024)
|
||||
{
|
||||
eprintln!("webview: DevTools port {port} open (LOTUS_WEBVIEW2_DEBUG_PORT)");
|
||||
args.push_str(&format!(
|
||||
" --remote-debugging-port={port} --use-fake-device-for-media-stream"
|
||||
));
|
||||
}
|
||||
args
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod webview2_args_tests {
|
||||
use super::webview2_browser_args;
|
||||
|
||||
#[test]
|
||||
fn debug_port_only_when_asked_for_and_valid() {
|
||||
let base = webview2_browser_args(None);
|
||||
assert!(base.contains("--disable-renderer-backgrounding"));
|
||||
assert!(!base.contains("remote-debugging"));
|
||||
assert!(webview2_browser_args(Some("9222"))
|
||||
.ends_with(" --remote-debugging-port=9222 --use-fake-device-for-media-stream"));
|
||||
for bad in ["", "abc", "80", "70000", "9222 --evil", "-1"] {
|
||||
assert_eq!(webview2_browser_args(Some(bad)), base, "{bad}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tray_tests {
|
||||
use super::*;
|
||||
|
||||
Reference in New Issue
Block a user