Modified: trunk/Source/WebKit/ChangeLog (274515 => 274516)
--- trunk/Source/WebKit/ChangeLog 2021-03-16 21:11:57 UTC (rev 274515)
+++ trunk/Source/WebKit/ChangeLog 2021-03-16 21:17:53 UTC (rev 274516)
@@ -1,3 +1,19 @@
+2021-03-16 Kate Cheney <[email protected]>
+
+ [Swift] Ambiguous use of 'closeAllMediaPresentations'
+ https://bugs.webkit.org/show_bug.cgi?id=223275
+ <rdar://problem/75447989>
+
+ Reviewed by Tim Horton.
+
+ We added back deprecated media playback control APIs in
+ https://trac.webkit.org/changeset/273186/webkit after a name change
+ to support early adoptors. Importing these methods to Swift causes
+ a method redefinition error because the completion handler in both
+ cases is nullable. We should ignore the deprecated APIs for Swift.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+
2021-03-16 John Wilander <[email protected]>
PCM: Test infrastructure for sending attribution reports to attribution website too
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (274515 => 274516)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-03-16 21:11:57 UTC (rev 274515)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-03-16 21:17:53 UTC (rev 274516)
@@ -532,12 +532,13 @@
@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
