[iOS] Silence MediaPlayer compile warnings
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2019 02:00:01 +0000 (02:00 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2019 02:00:01 +0000 (02:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193780
<rdar://problem/47518428>

Reviewed by Jer Noble.

Source/WebCore/PAL:

* pal/spi/ios/MediaPlayerSPI.h:

Source/WebKit:

* UIProcess/ios/forms/WKAirPlayRoutePicker.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm

index ea49060..ec8f0da 100644 (file)
@@ -1,3 +1,13 @@
+2019-01-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] Silence MediaPlayer compile warnings
+        https://bugs.webkit.org/show_bug.cgi?id=193780
+        <rdar://problem/47518428>
+
+        Reviewed by Jer Noble.
+
+        * pal/spi/ios/MediaPlayerSPI.h:
+
 2019-01-24  Ross Kirsling  <ross.kirsling@sony.com>
 
         Move FileSystem to WTF
index 82c8a20..dc413ae 100644 (file)
 
 #import <MediaPlayer/MPAVRoutingController.h>
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+#import <MediaPlayer/MPMediaControlsConfiguration.h>
+#endif
+
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 #import <MediaPlayer/MPMediaControlsViewController.h>
 #else
index ab3c62a..2c13684 100644 (file)
@@ -1,3 +1,13 @@
+2019-01-24  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] Silence MediaPlayer compile warnings
+        https://bugs.webkit.org/show_bug.cgi?id=193780
+        <rdar://problem/47518428>
+
+        Reviewed by Jer Noble.
+
+        * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+
 2019-01-24  Truitt Savell  <tsavell@apple.com>
 
         Unreviewed, rolling out r240446.
index 3fb4a7c..31f5604 100644 (file)
@@ -165,6 +165,8 @@ ALLOW_DEPRECATED_DECLARATIONS_END
 
 #else 
 
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+
 SOFT_LINK_FRAMEWORK(MediaPlayer)
 SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingController)
 SOFT_LINK_CLASS(MediaPlayer, MPMediaControlsConfiguration)
@@ -230,6 +232,8 @@ typedef NSInteger WKAirPlayRoutePickerRouteSharingPolicy;
 
 @end
 
+ALLOW_DEPRECATED_DECLARATIONS_END
+
 #endif
 
 #endif // PLATFORM(IOS_FAMILY) && ENABLE(AIRPLAY_PICKER)