fix: re-enable WindowCaptureMacV2 #37014
Closed
trop / Backportable? - 27-x-y
completed
Oct 11, 2023 in 55d 21h 24m 8s
Backport Failed
This PR was checked and could not be automatically backported to "27-x-y" cleanly
Details
Failed Diff:
diff --cc patches/chromium/desktop_media_list.patch
index c5d2f65e00,766b0e2893..0000000000
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@@ -82,28 -81,10 +81,32 @@@ index 33ca7a53dfb6d2c9e3a33f0065a3acd80
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 c2c7d86ed1f089ca6abbb026b4cf4e2857ef66c1..d65182dbae1447d95230a581943d23ee144d9dbe 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
++<<<<<<< HEAD
+@@ -160,7 +160,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
+@@ -244,7 +244,7 @@ class NativeDesktopMediaList::Worker
+ base::WeakPtr<NativeDesktopMediaList> media_list_;
+
+ DesktopMediaList::Type type_;
+- const std::unique_ptr<ThumbnailCapturer> capturer_;
++ std::unique_ptr<ThumbnailCapturer> capturer_;
+ const ThumbnailCapturer::FrameDeliveryMethod frame_delivery_method_;
+ const bool add_current_process_windows_;
+
+@@ -531,6 +531,12 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++=======
+ @@ -451,6 +451,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++>>>>>>> fix: re-enable WindowCaptureMacV2
FROM_HERE,
base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
media_list_));
Annotations
Check failure on line 97 in patches/chromium/desktop_media_list.patch
trop / Backportable? - 27-x-y
patches/chromium/desktop_media_list.patch#L88-L97
Patch Conflict
Raw output
++<<<<<<< HEAD
+@@ -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,12 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++=======
+ @@ -451,6 +451,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++>>>>>>> fix: re-enable WindowCaptureMacV2
Check failure on line 106 in patches/chromium/desktop_media_list.patch
trop / Backportable? - 27-x-y
patches/chromium/desktop_media_list.patch#L88-L106
Patch Conflict
Raw output
++<<<<<<< HEAD
+@@ -160,7 +160,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
+@@ -244,7 +244,7 @@ class NativeDesktopMediaList::Worker
+ base::WeakPtr<NativeDesktopMediaList> media_list_;
+
+ DesktopMediaList::Type type_;
+- const std::unique_ptr<ThumbnailCapturer> capturer_;
++ std::unique_ptr<ThumbnailCapturer> capturer_;
+ const ThumbnailCapturer::FrameDeliveryMethod frame_delivery_method_;
+ const bool add_current_process_windows_;
+
+@@ -531,6 +531,12 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++=======
+ @@ -451,6 +451,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++>>>>>>> fix: re-enable WindowCaptureMacV2
Check failure on line 106 in patches/chromium/desktop_media_list.patch
trop / Backportable? - 27-x-y
patches/chromium/desktop_media_list.patch#L88-L106
Patch Conflict
Raw output
++<<<<<<< HEAD
+@@ -160,7 +160,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
+@@ -244,7 +244,7 @@ class NativeDesktopMediaList::Worker
+ base::WeakPtr<NativeDesktopMediaList> media_list_;
+
+ DesktopMediaList::Type type_;
+- const std::unique_ptr<ThumbnailCapturer> capturer_;
++ std::unique_ptr<ThumbnailCapturer> capturer_;
+ const ThumbnailCapturer::FrameDeliveryMethod frame_delivery_method_;
+ const bool add_current_process_windows_;
+
+@@ -531,6 +531,12 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++=======
+ @@ -451,6 +451,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++>>>>>>> fix: re-enable WindowCaptureMacV2
Check failure on line 106 in patches/chromium/desktop_media_list.patch
trop / Backportable? - 27-x-y
patches/chromium/desktop_media_list.patch#L88-L106
Patch Conflict
Raw output
++<<<<<<< HEAD
+@@ -160,7 +160,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
+@@ -244,7 +244,7 @@ class NativeDesktopMediaList::Worker
+ base::WeakPtr<NativeDesktopMediaList> media_list_;
+
+ DesktopMediaList::Type type_;
+- const std::unique_ptr<ThumbnailCapturer> capturer_;
++ std::unique_ptr<ThumbnailCapturer> capturer_;
+ const ThumbnailCapturer::FrameDeliveryMethod frame_delivery_method_;
+ const bool add_current_process_windows_;
+
+@@ -531,6 +531,12 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++=======
+ @@ -451,6 +451,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
++>>>>>>> fix: re-enable WindowCaptureMacV2
Loading