Title: [264482] trunk/Source
- Revision
- 264482
- Author
- [email protected]
- Date
- 2020-07-16 15:25:28 -0700 (Thu, 16 Jul 2020)
Log Message
Use AVRoutePickerView when available for choosing AirPlay devices
https://bugs.webkit.org/show_bug.cgi?id=213497
<rdar://problem/58610662>
Unreviewed build fix.
Source/WebCore:
* platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::routePicker): Use HAVE_AVROUTEPICKERVIEW.
Source/WTF:
* wtf/PlatformHave.h: Define HAVE_AVROUTEPICKERVIEW.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (264481 => 264482)
--- trunk/Source/WTF/ChangeLog 2020-07-16 21:59:33 UTC (rev 264481)
+++ trunk/Source/WTF/ChangeLog 2020-07-16 22:25:28 UTC (rev 264482)
@@ -1,3 +1,13 @@
+2020-07-16 Eric Carlson <[email protected]>
+
+ Use AVRoutePickerView when available for choosing AirPlay devices
+ https://bugs.webkit.org/show_bug.cgi?id=213497
+ <rdar://problem/58610662>
+
+ Unreviewed build fix.
+
+ * wtf/PlatformHave.h: Define HAVE_AVROUTEPICKERVIEW.
+
2020-07-16 Jonathan Bedard <[email protected]>
[Big Sur] De-duplicate SPI
Modified: trunk/Source/WTF/wtf/PlatformHave.h (264481 => 264482)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-07-16 21:59:33 UTC (rev 264481)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-07-16 22:25:28 UTC (rev 264482)
@@ -695,3 +695,7 @@
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
#define HAVE_LSDATABASECONTEXT 1
#endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
+#define HAVE_AVROUTEPICKERVIEW 1
+#endif
Modified: trunk/Source/WebCore/ChangeLog (264481 => 264482)
--- trunk/Source/WebCore/ChangeLog 2020-07-16 21:59:33 UTC (rev 264481)
+++ trunk/Source/WebCore/ChangeLog 2020-07-16 22:25:28 UTC (rev 264482)
@@ -4,6 +4,18 @@
https://bugs.webkit.org/show_bug.cgi?id=213497
<rdar://problem/58610662>
+ Unreviewed build fix.
+
+ * platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::routePicker): Use HAVE_AVROUTEPICKERVIEW.
+
+2020-07-16 Eric Carlson <[email protected]>
+
+ Use AVRoutePickerView when available for choosing AirPlay devices
+ https://bugs.webkit.org/show_bug.cgi?id=213497
+ <rdar://problem/58610662>
+
Reviewed by Jer Noble.
Use an AVRoutePickerView, the replacement for AVOutputDeviceMenuController, when
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm (264481 => 264482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm 2020-07-16 21:59:33 UTC (rev 264481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm 2020-07-16 22:25:28 UTC (rev 264482)
@@ -26,7 +26,7 @@
#import "config.h"
#import "AVRoutePickerViewTargetPicker.h"
-#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && HAVE(AVROUTEPICKERVIEW)
#import "Logging.h"
#import <AVFoundation/AVRouteDetector.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (264481 => 264482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2020-07-16 21:59:33 UTC (rev 264481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2020-07-16 22:25:28 UTC (rev 264482)
@@ -73,9 +73,11 @@
if (m_routePicker)
return *m_routePicker;
+#if HAVE(AVROUTEPICKERVIEW)
if (AVRoutePickerViewTargetPicker::isAvailable())
m_routePicker = makeUnique<AVRoutePickerViewTargetPicker>(*this);
else
+#endif
m_routePicker = makeUnique<AVOutputDeviceMenuControllerTargetPicker>(*this);
return *m_routePicker;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
