From 7b634dead1ada3ddb1c73d5cd0e63c756331428e Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Wed, 18 Aug 2021 10:04:40 -0400 Subject: [PATCH] fixup Disable kDesktopCaptureMacV2 --- shell/browser/native_window_mac.mm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index 00b4517f2fae9..d2d7898c81a0c 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -257,9 +257,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { // Refs https://github.com/electron/electron/pull/30507 // TODO(deepak1556): Enable this flag to match upstream +#if 0 const base::Feature kWindowCaptureMacV2{"WindowCaptureMacV2", base::FEATURE_DISABLED_BY_DEFAULT}; - +#endif } // namespace NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options, @@ -1260,11 +1261,15 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { content::DesktopMediaID::TYPE_WINDOW, GetAcceleratedWidget()); // c.f. // https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/media/webrtc/native_desktop_media_list.cc;l=372?q=kWindowCaptureMacV2&ss=chromium +// Refs https://github.com/electron/electron/pull/30507 +// TODO(deepak1556): Enable this flag to match upstream WindowCaptureMacV2" +#if 0 if (base::FeatureList::IsEnabled(kWindowCaptureMacV2)) { if (remote_cocoa::ScopedCGWindowID::Get(desktop_media_id.id)) { desktop_media_id.window_id = desktop_media_id.id; } } +#endif return desktop_media_id; }