Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 20:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1918996 - Use SCShareableContentStyleNone on macOS 15. r=webrtc-reviewers,jib

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D222270
This commit is contained in:
Andreas Pehrson 2024-09-16 14:51:45 +00:00
parent 56e7b2fcfb
commit 631ef15a76
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
third_party/libwebrtc/modules/desktop_capture/mac/screen_capturer_sck.mm vendored
View File

@ -305,10 +305,18 @@ void ScreenCapturerSck::EnsureVisible() {
SCContentSharingPickerConfiguration* config = picker.defaultConfiguration;
config.allowedPickerModes = picker_modes_;
picker.defaultConfiguration = config;
SCShareableContentStyle style = SCShareableContentStyleNone;
// Pick a sensible style to start out with, based on our current mode.
// Default to Screen because if using Window the picker automatically hides
// our current window to show others.
SCShareableContentStyle style = SCShareableContentStyleDisplay;
if (@available(macOS 15, *)) {
// Stick with None because if we use Display, the picker doesn't let us
// pick a window when first opened. Behaves like Window in 14 except doesn't
// change window focus.
} else {
// Default to Display because if using Window the picker automatically hides
// our current window to show others. Saves a click compared to None when
// picking a display.
style = SCShareableContentStyleDisplay;
}
if (picker_modes_ == SCContentSharingPickerModeSingleDisplay) {
style = SCShareableContentStyleDisplay;
} else if (picker_modes_ == SCContentSharingPickerModeSingleWindow ||