Attachment 370339 Details for Bug 198083 – Patch

[patch] Patch

bug-198083-20190521135518.patch (text/plain), 3.95 KB, created by Alex Christensen on 2019-05-21 13:55:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-05-21 13:55:19 PDT

Size: 3.95 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 245594)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-05-21  Alex Christensen  <achristensen@webkit.org>
>+
>+        Mark WKUIDelegate webView:shouldPreviewElement: and webView:previewingViewControllerForElement:defaultActions: as deprecated
>+        https://bugs.webkit.org/show_bug.cgi?id=198083
>+        <rdar://problem/50735687>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKUIDelegate.h:
>+
> 2019-05-21  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         [WebAuthN] Make WebAuthN default on only on macOS
>Index: Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h	(revision 245545)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h	(working copy)
>@@ -129,7 +129,7 @@ NS_ASSUME_NONNULL_BEGIN
>  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 @@ NS_ASSUME_NONNULL_BEGIN
>  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.
>Index: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(revision 245545)
>+++ Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(working copy)
>@@ -7315,7 +7315,9 @@ - (BOOL)_interactionShouldBeginFromPrevi
>         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 @@ - (UIViewController *)_presentedViewCont
>                 [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:)])

Actions: View | Formatted Diff | Diff

Attachments on bug 198083: 370339