Attachment 340638 Details for Bug 185706 – Build fix.

[patch] Build fix.

bug-185706-20180517141004.patch (text/plain), 3.86 KB, created by Eric Carlson on 2018-05-17 14:10:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-17 14:10:05 PDT

Size: 3.86 KB

patch

obsolete

>Subversion Revision: 231918
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 41d9b538d5c4e4984e42b62de76ff99ae8a6ee12..82399c830c6a163d09269ffeb8a7b21aa113d479 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-17  Eric Carlson  <eric.carlson@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  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Extra zoom mode] Disabled adaptations are not reset upon mainframe navigation
>diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>index 749e5198eb83539f68aa65268a86035c84b0b1ab..53411548c63787f65669c4ed2559d54ab5302dc0 100644
>--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>@@ -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 @@ using namespace WebCore;
> @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 @@ using namespace WebCore;
> - (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 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
> {
>     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 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
> - (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 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
>     _monitoringAirPlayRoutes = false;
>     _routeDetector.get().routeDetectionEnabled = NO;
> }
>-#endif // HAVE(MEDIA_PLAYER)
>+#endif // HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
> 
> - (void)interruption:(NSNotification *)notification
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 185706: 340591 | 340610 | 340638