Title: [240463] branches/safari-607-branch/Source
- Revision
- 240463
- Author
- [email protected]
- Date
- 2019-01-24 18:24:33 -0800 (Thu, 24 Jan 2019)
Log Message
Cherry-pick r240461. rdar://problem/47536283
[iOS] Silence MediaPlayer compile warnings
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
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/PAL/ChangeLog (240462 => 240463)
--- branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-25 02:23:08 UTC (rev 240462)
+++ branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-25 02:24:33 UTC (rev 240463)
@@ -1,3 +1,34 @@
+2019-01-24 Alan Coon <[email protected]>
+
+ Cherry-pick r240461. rdar://problem/47536283
+
+ [iOS] Silence MediaPlayer compile warnings
+ 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
+
+ 2019-01-24 Eric Carlson <[email protected]>
+
+ [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 Kocsen Chung <[email protected]>
Cherry-pick r240430. rdar://problem/47484242
Modified: branches/safari-607-branch/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h (240462 => 240463)
--- branches/safari-607-branch/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2019-01-25 02:23:08 UTC (rev 240462)
+++ branches/safari-607-branch/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2019-01-25 02:24:33 UTC (rev 240463)
@@ -34,6 +34,10 @@
#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
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (240462 => 240463)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-25 02:23:08 UTC (rev 240462)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-25 02:24:33 UTC (rev 240463)
@@ -1,3 +1,34 @@
+2019-01-24 Alan Coon <[email protected]>
+
+ Cherry-pick r240461. rdar://problem/47536283
+
+ [iOS] Silence MediaPlayer compile warnings
+ 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
+
+ 2019-01-24 Eric Carlson <[email protected]>
+
+ [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-23 Alan Coon <[email protected]>
Cherry-pick r240325. rdar://problem/47494727
Modified: branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (240462 => 240463)
--- branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2019-01-25 02:23:08 UTC (rev 240462)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2019-01-25 02:24:33 UTC (rev 240463)
@@ -165,6 +165,8 @@
#else
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+
SOFT_LINK_FRAMEWORK(MediaPlayer)
SOFT_LINK_CLASS(MediaPlayer, MPAVRoutingController)
SOFT_LINK_CLASS(MediaPlayer, MPMediaControlsConfiguration)
@@ -230,6 +232,8 @@
@end
+ALLOW_DEPRECATED_DECLARATIONS_END
+
#endif
#endif // PLATFORM(IOS_FAMILY) && ENABLE(AIRPLAY_PICKER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
