Title: [245597] trunk/Source/WebKit
- Revision
- 245597
- Author
- [email protected]
- Date
- 2019-05-21 15:02:53 -0700 (Tue, 21 May 2019)
Log Message
Mark WKUIDelegate webView:shouldPreviewElement: and webView:previewingViewControllerForElement:defaultActions: as deprecated
https://bugs.webkit.org/show_bug.cgi?id=198083
<rdar://problem/50735687>
Patch by Alex Christensen <[email protected]> on 2019-05-21
Reviewed by Geoffrey Garen.
* UIProcess/API/Cocoa/WKUIDelegate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (245596 => 245597)
--- trunk/Source/WebKit/ChangeLog 2019-05-21 22:01:16 UTC (rev 245596)
+++ trunk/Source/WebKit/ChangeLog 2019-05-21 22:02:53 UTC (rev 245597)
@@ -1,3 +1,13 @@
+2019-05-21 Alex Christensen <[email protected]>
+
+ Mark WKUIDelegate webView:shouldPreviewElement: and webView:previewingViewControllerForElement:defaultActions: as deprecated
+ https://bugs.webkit.org/show_bug.cgi?id=198083
+ <rdar://problem/50735687>
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/API/Cocoa/WKUIDelegate.h:
+
2019-05-21 Wenson Hsieh <[email protected]>
The cost of WebViewImpl::hasMarkedTextWithCompletionHandler should not increase with document size
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h (245596 => 245597)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-05-21 22:01:16 UTC (rev 245596)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-05-21 22:02:53 UTC (rev 245597)
@@ -129,7 +129,7 @@
This method will only be invoked for elements that have default preview in WebKit, which is
limited to links. In the future, it could be invoked for additional elements.
*/
-- (BOOL)webView:(WKWebView *)webView shouldPreviewElement:(WKPreviewElementInfo *)elementInfo WK_API_AVAILABLE(ios(10.0));
+- (BOOL)webView:(WKWebView *)webView shouldPreviewElement:(WKPreviewElementInfo *)elementInfo WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
/*! @abstract Allows your app to provide a custom view controller to show when the given element is peeked.
@param webView The web view invoking the delegate method.
@@ -144,7 +144,7 @@
Returning nil will result in WebKit's default preview behavior. webView:commitPreviewingViewController: will only be invoked
if a non-nil view controller was returned.
*/
-- (nullable UIViewController *)webView:(WKWebView *)webView previewingViewControllerForElement:(WKPreviewElementInfo *)elementInfo defaultActions:(NSArray<id <WKPreviewActionItem>> *)previewActions WK_API_AVAILABLE(ios(10.0));
+- (nullable UIViewController *)webView:(WKWebView *)webView previewingViewControllerForElement:(WKPreviewElementInfo *)elementInfo defaultActions:(NSArray<id <WKPreviewActionItem>> *)previewActions WK_API_DEPRECATED("This API will be replaced", ios(10.0, WK_IOS_TBA));
/*! @abstract Allows your app to pop to the view controller it created.
@param webView The web view invoking the delegate method.
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (245596 => 245597)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-21 22:01:16 UTC (rev 245596)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-05-21 22:02:53 UTC (rev 245597)
@@ -7315,7 +7315,9 @@
id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
if ([uiDelegate respondsToSelector:@selector(webView:shouldPreviewElement:)]) {
auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:(NSURL *)linkURL]);
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return [uiDelegate webView:_webView shouldPreviewElement:previewElementInfo.get()];
+ALLOW_DEPRECATED_DECLARATIONS_END
}
if (linkURL.isEmpty())
return NO;
@@ -7464,8 +7466,10 @@
[previewActions addObject:previewAction];
}
auto previewElementInfo = adoptNS([[WKPreviewElementInfo alloc] _initWithLinkURL:targetURL]);
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (UIViewController *controller = [uiDelegate webView:_webView previewingViewControllerForElement:previewElementInfo.get() defaultActions:previewActions.get()])
return controller;
+ALLOW_DEPRECATED_DECLARATIONS_END
}
if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:defaultActions:elementInfo:)])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
