Skip to content

fix: defer to CEF default media permission handling (fix #15905) #15906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Waquo wants to merge 1 commit into
base: feat/cef
Choose a base branch
from
+6 −25
Open

fix: defer to CEF default media permission handling (fix #15905) #15906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions crates/tauri-runtime-cef/src/cef_impl/client/permission.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,10 @@ wrap_permission_handler! {
_browser: Option<&mut Browser>,
_frame: Option<&mut Frame>,
_requesting_origin: Option<&CefString>,
requested_permissions: u32,
callback: Option<&mut MediaAccessCallback>,
_requested_permissions: u32,
_callback: Option<&mut MediaAccessCallback>,
) -> ::std::os::raw::c_int {
let Some(callback) = callback else {
return 0;
};
// Allow microphone and camera when requested.
let allowed = requested_permissions
& (cef::sys::cef_media_access_permission_types_t::CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE
as u32
| cef::sys::cef_media_access_permission_types_t::CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE
as u32);
if allowed != 0 {
callback.cont(requested_permissions);
return 1;
}
// Use CEF's default media permission handling.
0
}

Expand All @@ -38,16 +26,10 @@ wrap_permission_handler! {
_prompt_id: u64,
_requesting_origin: Option<&CefString>,
_requested_permissions: u32,
callback: Option<&mut PermissionPromptCallback>,
_callback: Option<&mut PermissionPromptCallback>,
) -> ::std::os::raw::c_int {
let Some(callback) = callback else {
return 0;
};
// Allow permission prompt (e.g. microphone/camera).
callback.cont(PermissionRequestResult::from(
cef::sys::cef_permission_request_result_t::CEF_PERMISSION_RESULT_ACCEPT,
));
1
// Use CEF's default permission prompt handling.
0
}
}
}
1 change: 0 additions & 1 deletion crates/tauri-runtime-cef/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,6 @@ impl<T: UserEvent> CefRuntime<T> {
cache_path: Arc::new(cache_path.clone()),
};

command_line_args.push(("--enable-media-stream".to_string(), None));
let mut app = TauriCefApp::new(
context.clone(),
context_initialized.clone(),
Expand Down