fix: re-enable WindowCaptureMacV2

patches/chromium/desktop_media_list.patch

@@ -4,7 +4,6 @@
 Subject: desktop_media_list.patch
 
 * Use our grit resources instead of the chrome ones.
-* Disabled WindowCaptureMacV2 feature for https://github.com/electron/electron/pull/30507
 * Ensure "OnRefreshComplete()" even if there are no items in the list
 
 diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -82,37 +81,28 @@
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index b548c9fbd3c0bf425447b29dcd866cd27e96b14c..f994ac6086c7b4cd3e8534f34691189d78a21601 100644
+index b548c9fbd3c0bf425447b29dcd866cd27e96b14c..1e4c572deb0b20416f3fa65f7fe6d33612e3b691 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -147,7 +147,7 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
- #if BUILDFLAG(IS_MAC)
- BASE_FEATURE(kWindowCaptureMacV2,
-              "WindowCaptureMacV2",
--             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
-
- }  // namespace
 @@ -457,6 +457,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
        FROM_HERE,
        base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                       media_list_));
 +
 +  // This call is necessary to release underlying OS screen capture mechanisms.
 +  capturer_.reset();
  }
 
  void NativeDesktopMediaList::Worker::OnCaptureResult(
 @@ -829,6 +832,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
          FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
                                    base::Unretained(worker_.get()),
                                    std::move(native_ids), thumbnail_size_));
 +  } else {
 +#if defined(USE_AURA)
 +    pending_native_thumbnail_capture_ = true;
 +#endif
 +    UpdateNativeThumbnailsFinished();
    }
  }
 

shell/browser/api/electron_api_desktop_capturer.cc

@@ -152,8 +152,10 @@
       v8::Isolate* isolate,
       const electron::api::DesktopCapturer::Source& source) {
     gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
-    content::DesktopMediaID id = source.media_list_source.id;
     dict.Set("name", base::UTF16ToUTF8(source.media_list_source.name));
+    content::DesktopMediaID id = source.media_list_source.id;
+    if (id.window_id == id.id)
+      id.window_id = content::DesktopMediaID::kNullId;
     dict.Set("id", id.ToString());
     dict.Set("thumbnail",
              electron::api::NativeImage::Create(

shell/browser/native_window_mac.mm

@@ -1234,32 +1234,22 @@
 gfx::NativeWindow NativeWindowMac::GetNativeWindow() const {
   return window_;
 }
 
 gfx::AcceleratedWidget NativeWindowMac::GetAcceleratedWidget() const {
   return [window_ windowNumber];
 }
 
 content::DesktopMediaID NativeWindowMac::GetDesktopMediaID() const {
-  auto desktop_media_id = content::DesktopMediaID(
-      content::DesktopMediaID::TYPE_WINDOW, GetAcceleratedWidget());
-  // c.f.
-  // https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/media/webrtc/native_desktop_media_list.cc;l=775-780;drc=79502ab47f61bff351426f57f576daef02b1a8dc
-  // Refs https://github.com/electron/electron/pull/30507
-  // TODO(deepak1556): Match upstream for `kWindowCaptureMacV2`
-#if 0
-    if (remote_cocoa::ScopedCGWindowID::Get(desktop_media_id.id)) {
-      desktop_media_id.window_id = desktop_media_id.id;
-    }
-#endif
-  return desktop_media_id;
+  return content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW,
+                                 GetAcceleratedWidget());
 }
 
 NativeWindowHandle NativeWindowMac::GetNativeWindowHandle() const {
   return [window_ contentView];
 }
 
 void NativeWindowMac::SetProgressBar(double progress,
                                      const NativeWindow::ProgressState state) {
   NSDockTile* dock_tile = [NSApp dockTile];
 
   // Sometimes macOS would install a default contentView for dock, we must
@@ -1335,22 +1325,22 @@
   [window_ setDisableAutoHideCursor:!auto_hide];
 }
 
 void NativeWindowMac::UpdateVibrancyRadii(bool fullscreen) {
   NSVisualEffectView* vibrantView = [window_ vibrantView];
 
   if (vibrantView != nil && !vibrancy_type_.empty()) {
     const bool no_rounded_corner = !HasStyleMask(NSWindowStyleMaskTitled);
     if (!has_frame() && !is_modal() && !no_rounded_corner) {
       CGFloat radius;
       if (fullscreen) {
         radius = 0.0f;
       } else if (@available(macOS 11.0, *)) {
         radius = 9.0f;
       } else {
         // Smaller corner radius on versions prior to Big Sur.
         radius = 5.0f;
       }
 
       CGFloat dimension = 2 * radius + 1;
       NSSize size = NSMakeSize(dimension, dimension);
       NSImage* maskImage = [NSImage imageWithSize:size

spec/api-desktop-capturer-spec.ts

@@ -113,11 +113,16 @@
   });
 
   it('getSources should not incorrectly duplicate window_id', async () => {
-    const w = new BrowserWindow({ show: false, width: 100, height: 100, webPreferences: { contextIsolation: false } });
+    const w = new BrowserWindow({
+      show: false,
+      width: 100,
+      height: 100,
+      webPreferences: { contextIsolation: false }
+    });
     const wShown = once(w, 'show');
     const wFocused = once(w, 'focus');
     w.show();
     w.focus();
     await wShown;
     await wFocused;