Skip to content

feat: use window DesktopMediaID when no source ID specified OS-15494 #144

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
t-bashir-bs wants to merge 1 commit into
base: 28-x-y-bs
Choose a base branch
from
Open

feat: use window DesktopMediaID when no source ID specified OS-15494 #144

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
25 changes: 23 additions & 2 deletions shell/browser/web_contents_permission_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents_user_data.h"
#include "shell/browser/electron_permission_manager.h"
#include "shell/browser/native_window.h"
// #include "shell/browser/media/media_stream_devices_controller.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/webrtc/media_stream_devices_controller.h"
Expand Down Expand Up @@ -68,8 +69,28 @@ void HandleUserMediaRequest(const content::MediaStreamRequest& request,
// If the device id wasn't specified then this is a screen capture request
// (i.e. chooseDesktopMedia() API wasn't used to generate device id).
if (request.requested_video_device_id.empty()) {
screen_id = content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
-1 /* kFullDesktopScreenId */);
// TYPE_SCREEN with id -1 (kFullDesktopScreenId) does not work on
// ozone/wayland + nexus. Fall back to capturing the requesting
// BrowserWindow itself via its NativeWindow DesktopMediaID, which
// uses TYPE_WINDOW and works on all platforms.
content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
request.render_process_id, request.render_frame_id);
NativeWindow* native_window = nullptr;
if (rfh) {
auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
if (web_contents) {
auto* relay = NativeWindowRelay::FromWebContents(web_contents);
if (relay)
native_window = relay->GetNativeWindow();
}
}
if (native_window) {
screen_id = native_window->GetDesktopMediaID();
} else {
screen_id =
content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
-1 /* kFullDesktopScreenId */);
}
} else {
screen_id =
content::DesktopMediaID::Parse(request.requested_video_device_id);
Expand Down
Loading