From f493af92610392296edb42ef6037a3ed17474b36 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index 00b4517f2fae9..f52e8fb4b38d4 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -1260,11 +1260,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; }