06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Mon, 16 Sep 2024 14:51:00 +0000
|
|
Subject: Bug 1918996 - Use SCShareableContentStyleNone on macOS 15.
|
|
r=webrtc-reviewers,jib
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D222270
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ade6f6dc0c5a5df1c87e78a45b2878c4ade54358
|
|
---
|
|
modules/desktop_capture/mac/screen_capturer_sck.mm | 14 +++++++++++---
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules/desktop_capture/mac/screen_capturer_sck.mm b/modules/desktop_capture/mac/screen_capturer_sck.mm
|
|
index 92c7dadebe..0d48a340ae 100644
|
|
--- a/modules/desktop_capture/mac/screen_capturer_sck.mm
|
|
+++ b/modules/desktop_capture/mac/screen_capturer_sck.mm
|
|
@@ -331,10 +331,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 ||
|