diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-07-07 12:57:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 11:48:18 +0100 |
| commit | 15483f4e04420e42e4ea2391dc5b615496943451 (patch) | |
| tree | 9736eb9e1706ae0107da5049836cc74419dcad47 | |
| parent | 6aa502db444a8feb721698d2e85b1e0c16e749d6 (diff) | |
| download | qtwebengine-chromium-15483f4e04420e42e4ea2391dc5b615496943451.tar.gz | |
Temporary fix for missing macOS 12.3 SDK
Change-Id: I2417fe6876b8cc26fc70087e341bf03481c89641
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/content/browser/BUILD.gn | 12 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index d9452122bc7..da4ffbd311f 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -2694,8 +2694,6 @@ jumbo_source_set("browser") { "media/capture/io_surface_capture_device_base_mac.cc", "media/capture/io_surface_capture_device_base_mac.h", "media/capture/mouse_cursor_overlay_controller_mac.mm", - "media/capture/screen_capture_kit_device_mac.h", - "media/capture/screen_capture_kit_device_mac.mm", "media/capture/views_widget_video_capture_device_mac.cc", "media/capture/views_widget_video_capture_device_mac.h", ] @@ -2703,8 +2701,14 @@ jumbo_source_set("browser") { "//sandbox/mac:seatbelt", "//sandbox/mac:seatbelt_extension", ] - frameworks += [ "CoreMedia.framework" ] - weak_frameworks = [ "ScreenCaptureKit.framework" ] + if (!use_qt) { # Actually should check if macOS sdk 12.3 is available + sources += [ + "media/capture/screen_capture_kit_device_mac.h", + "media/capture/screen_capture_kit_device_mac.mm", + ] + frameworks += [ "CoreMedia.framework" ] + weak_frameworks = [ "ScreenCaptureKit.framework" ] + } } if (is_chromeos_lacros) { sources += [ diff --git a/chromium/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/chromium/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc index 681b70d6a82..348f4c1e3ec 100644 --- a/chromium/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc +++ b/chromium/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc @@ -494,11 +494,14 @@ void InProcessVideoCaptureDeviceLauncher::DoStartDesktopCaptureOnDeviceThread( #if BUILDFLAG(IS_MAC) // Prefer using ScreenCaptureKit. After that try DesktopCaptureDeviceMac, and // if both fail, use the generic DesktopCaptureDevice. +#ifndef TOOLKIT_QT + // ### Requires macOS sdk 12.3: if (!video_capture_device && base::FeatureList::IsEnabled(kScreenCaptureKitMac)) { if ((video_capture_device = CreateScreenCaptureKitDeviceMac(desktop_id))) implementation = kScreenCaptureKitDeviceMac; } +#endif if (!video_capture_device && base::FeatureList::IsEnabled(kDesktopCaptureMacV2)) { if ((video_capture_device = CreateDesktopCaptureDeviceMac(desktop_id))) |