Title: [240529] tags/Safari-608.1.2.1/Source
- Revision
- 240529
- Author
- [email protected]
- Date
- 2019-01-25 16:18:46 -0800 (Fri, 25 Jan 2019)
Log Message
Cherry-pick r240461. rdar://problem/47518428
[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: tags/Safari-608.1.2.1/Source/WebCore/PAL/ChangeLog (240528 => 240529)
--- tags/Safari-608.1.2.1/Source/WebCore/PAL/ChangeLog 2019-01-26 00:09:37 UTC (rev 240528)
+++ tags/Safari-608.1.2.1/Source/WebCore/PAL/ChangeLog 2019-01-26 00:18:46 UTC (rev 240529)
@@ -1,3 +1,34 @@
+2019-01-25 Alan Coon <[email protected]>
+
+ Cherry-pick r240461. rdar://problem/47518428
+
+ [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-22 David Kilzer <[email protected]>
Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
Modified: tags/Safari-608.1.2.1/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h (240528 => 240529)
--- tags/Safari-608.1.2.1/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2019-01-26 00:09:37 UTC (rev 240528)
+++ tags/Safari-608.1.2.1/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2019-01-26 00:18:46 UTC (rev 240529)
@@ -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: tags/Safari-608.1.2.1/Source/WebKit/ChangeLog (240528 => 240529)
--- tags/Safari-608.1.2.1/Source/WebKit/ChangeLog 2019-01-26 00:09:37 UTC (rev 240528)
+++ tags/Safari-608.1.2.1/Source/WebKit/ChangeLog 2019-01-26 00:18:46 UTC (rev 240529)
@@ -1,3 +1,34 @@
+2019-01-25 Alan Coon <[email protected]>
+
+ Cherry-pick r240461. rdar://problem/47518428
+
+ [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-22 Daniel Bates <[email protected]>
[iOS] Interpret text key commands on keydown and app key commands on keypress
Modified: tags/Safari-608.1.2.1/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (240528 => 240529)
--- tags/Safari-608.1.2.1/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2019-01-26 00:09:37 UTC (rev 240528)
+++ tags/Safari-608.1.2.1/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2019-01-26 00:18:46 UTC (rev 240529)
@@ -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
