Modified: trunk/Source/WebKit/ChangeLog (274968 => 274969)
--- trunk/Source/WebKit/ChangeLog 2021-03-24 20:37:57 UTC (rev 274968)
+++ trunk/Source/WebKit/ChangeLog 2021-03-24 20:40:28 UTC (rev 274969)
@@ -1,3 +1,22 @@
+2021-03-24 Kate Cheney <[email protected]>
+
+ Remove deprecated WKMediaPlayback APIs
+ https://bugs.webkit.org/show_bug.cgi?id=223704
+ <rdar://problem/74611683>
+
+ Reviewed by Tim Horton.
+
+ We kept these API around after updating the names to give clients
+ time to adopt the new versions. We can remove them now.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView pauseAllMediaPlayback:]): Deleted.
+ (-[WKWebView suspendAllMediaPlayback:]): Deleted.
+ (-[WKWebView resumeAllMediaPlayback:]): Deleted.
+ (-[WKWebView closeAllMediaPresentations:]): Deleted.
+ (-[WKWebView requestMediaPlaybackState:]): Deleted.
+
2021-03-24 Alex Christensen <[email protected]>
Call InitializeWebKit2 when initializing a _WKUserInitiatedAction
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (274968 => 274969)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-03-24 20:37:57 UTC (rev 274968)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-03-24 20:40:28 UTC (rev 274969)
@@ -567,13 +567,6 @@
@property (nonatomic, readonly, copy) NSArray *certificateChain WK_API_DEPRECATED_WITH_REPLACEMENT("serverTrust", macos(10.11, 10.12), ios(9.0, 10.0));
-#ifndef __swift__
-- (void)pauseAllMediaPlayback:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("pauseAllMediaPlaybackWithCompletionHandler", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-- (void)suspendAllMediaPlayback:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("setAllMediaPlaybackSuspended:suspended", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-- (void)resumeAllMediaPlayback:(void (^ _Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("setAllMediaPlaybackSuspended:suspended", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-- (void)closeAllMediaPresentations:(void (^_Nullable)(void))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("closeAllMediaPresentationsWithCompletionHandler", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-- (void)requestMediaPlaybackState:(void (^)(WKMediaPlaybackState))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("requestMediaPlaybackStateWithCompletionHandler", macos(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-#endif
@end
NS_ASSUME_NONNULL_END
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (274968 => 274969)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-03-24 20:37:57 UTC (rev 274968)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-03-24 20:40:28 UTC (rev 274969)
@@ -3337,31 +3337,6 @@
return (__bridge NSArray *)certificateInfo->certificateInfo().certificateChain() ?: @[ ];
}
-- (void)pauseAllMediaPlayback:(void (^)(void))completionHandler
-{
- [self pauseAllMediaPlaybackWithCompletionHandler:completionHandler];
-}
-
-- (void)suspendAllMediaPlayback:(void (^)(void))completionHandler
-{
- [self setAllMediaPlaybackSuspended:YES completionHandler:completionHandler];
-}
-
-- (void)resumeAllMediaPlayback:(void (^)(void))completionHandler
-{
- [self setAllMediaPlaybackSuspended:NO completionHandler:completionHandler];
-}
-
-- (void)closeAllMediaPresentations:(void (^)(void))completionHandler
-{
- [self closeAllMediaPresentationsWithCompletionHandler:completionHandler];
-}
-
-- (void)requestMediaPlaybackState:(void (^)(WKMediaPlaybackState))completionHandler
-{
- [self requestMediaPlaybackStateWithCompletionHandler:completionHandler];
-}
-
@end
@implementation WKWebView (WKBinaryCompatibilityWithIOS10)
