Modified: trunk/Source/WebCore/ChangeLog (231920 => 231921)
--- trunk/Source/WebCore/ChangeLog 2018-05-17 21:02:23 UTC (rev 231920)
+++ trunk/Source/WebCore/ChangeLog 2018-05-17 21:48:49 UTC (rev 231921)
@@ -1,3 +1,15 @@
+2018-05-17 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] Update AirPlay route monitoring
+ https://bugs.webkit.org/show_bug.cgi?id=185706
+ <rdar://problem/40230677>
+
+ Unreviewed, fix extra zoom mode build after r231913.
+
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (-[WebMediaSessionHelper dealloc]):
+ (-[WebMediaSessionHelper hasWirelessTargetsAvailable]):
+
2018-05-17 Jer Noble <jer.no...@apple.com>
CRASH in ImageDecoderAVFObjC::sampleAtIndex()
Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (231920 => 231921)
--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2018-05-17 21:02:23 UTC (rev 231920)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2018-05-17 21:48:49 UTC (rev 231921)
@@ -51,12 +51,15 @@
SOFT_LINK_FRAMEWORK(AVFoundation)
SOFT_LINK_CLASS(AVFoundation, AVAudioSession)
-SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
+SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
+#endif
+
#define AVAudioSession getAVAudioSessionClass()
#define AVAudioSessionInterruptionNotification getAVAudioSessionInterruptionNotification()
#define AVAudioSessionInterruptionTypeKey getAVAudioSessionInterruptionTypeKey()
@@ -101,7 +104,9 @@
@interface WebMediaSessionHelper : NSObject {
MediaSessionManageriOS* _callback;
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
RetainPtr<AVRouteDetector> _routeDetector;
+#endif
bool _monitoringAirPlayRoutes;
bool _startMonitoringAirPlayRoutesPending;
}
@@ -115,7 +120,7 @@
- (void)applicationDidEnterBackground:(NSNotification *)notification;
- (BOOL)hasWirelessTargetsAvailable;
-#if HAVE(MEDIA_PLAYER)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
- (void)startMonitoringAirPlayRoutes;
- (void)stopMonitoringAirPlayRoutes;
#endif
@@ -345,7 +350,7 @@
{
LOG(Media, "-[WebMediaSessionHelper dealloc]");
-#if HAVE(MEDIA_PLAYER)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
if (!pthread_main_np()) {
dispatch_async(dispatch_get_main_queue(), [routeDetector = WTFMove(_routeDetector)] () mutable {
LOG(Media, "safelyTearDown - dipatched to UI thread.");
@@ -371,10 +376,14 @@
- (BOOL)hasWirelessTargetsAvailable
{
LOG(Media, "-[WebMediaSessionHelper hasWirelessTargetsAvailable]");
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
return _routeDetector.get().multipleRoutesDetected;
+#else
+ return NO;
+#endif
}
-#if HAVE(MEDIA_PLAYER)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
- (void)startMonitoringAirPlayRoutes
{
if (_monitoringAirPlayRoutes)
@@ -419,7 +428,7 @@
_monitoringAirPlayRoutes = false;
_routeDetector.get().routeDetectionEnabled = NO;
}
-#endif // HAVE(MEDIA_PLAYER)
+#endif // HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
- (void)interruption:(NSNotification *)notification
{
