Attachment 373123 Details for Bug 199296 – Patch

[patch] Patch

bug-199296-20190628095500.patch (text/plain), 8.88 KB, created by Alex Christensen on 2019-06-28 09:55:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-28 09:55:01 PDT

Size: 8.88 KB

patch

obsolete

>Subversion Revision: 246896
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index dcb3e109101ae7c82471a0356db0837bcc825f13..8c07084da0cadd6dcb36b58d77444820dc8cdaab 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-27  Alex Christensen  <achristensen@webkit.org>
>+
>+        Deprecate but still call _webView:showCustomSheetForElement: after transition to UIContextMenuInteraction
>+        https://bugs.webkit.org/show_bug.cgi?id=199296
>+        <rdar://problem/51041960>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView _showAttachmentSheet]):
>+        (-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):
>+        (-[WKContentView continueContextMenuInteraction:]):
>+
> 2019-06-27  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebSockets: avoid data copies when queuing tasks in WebSocketChannel
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>index d66dd6f2c2edf50a97fe07816973949b1277249d..668d5d3cd7f46d91ae1f217eb2a9046e1a51f095 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>@@ -156,18 +156,18 @@ struct UIEdgeInsets;
> - (void)_webView:(WKWebView *)webView contextMenuDidEndForElement:(WKContextMenuElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
> #endif
> 
>-- (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(10.0));
>+- (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_API_DEPRECATED_WITH_REPLACEMENT("_webView:contextMenuConfigurationForElement:completionHandler:", ios(10.0, WK_IOS_TBA));
> - (void)_webView:(WKWebView *)webView alternateActionForURL:(NSURL *)url WK_API_AVAILABLE(ios(10.0));
> - (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_API_AVAILABLE(ios(10.0));
> - (NSArray *)_attachmentListForWebView:(WKWebView *)webView sourceIsManaged:(BOOL*)sourceIsManaged WK_API_AVAILABLE(ios(10.3));
> - (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(10.3));
> - (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_API_AVAILABLE(ios(9.0));
>-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(9.0, WK_IOS_TBA));
>-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(9.0, WK_IOS_TBA));
>+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
>+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
> - (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_API_AVAILABLE(ios(10.0));
> - (void)_webView:(WKWebView *)webView getAlternateURLFromImage:(UIImage *)image completionHandler:(void (^)(NSURL *alternateURL, NSDictionary *userInfo))completionHandler WK_API_AVAILABLE(ios(11.0));
> - (NSURL *)_webView:(WKWebView *)webView alternateURLFromImage:(UIImage *)image userInfo:(NSDictionary **)userInfo WK_API_AVAILABLE(ios(11.0));
>-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForImage:(UIImage *)image alternateURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:", ios(11.0, WK_IOS_TBA));
>+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForImage:(UIImage *)image alternateURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(11.0, WK_IOS_TBA));
> - (NSArray *)_webView:(WKWebView *)webView adjustedDataInteractionItemProviders:(NSArray *)originalItemProviders WK_API_AVAILABLE(ios(11.0));
> - (NSArray *)_webView:(WKWebView *)webView adjustedDataInteractionItemProvidersForItemProvider:(id)itemProvider representingObjects:(NSArray *)representingObjects additionalData:(NSDictionary *)additionalData WK_API_AVAILABLE(ios(11.0));
> - (BOOL)_webView:(WKWebView *)webView performDataInteractionOperationWithItemProviders:(NSArray *)itemProviders WK_API_AVAILABLE(ios(11.0));
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 33938e495dfeb5b35d950d41cae488b982b2490f..810951e3ffd5e0d99989b5a5112baa543341f8ba 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1866,7 +1866,9 @@ static inline bool isSamePair(UIGestureRecognizer *a, UIGestureRecognizer *b, UI
>         return;
> 
>     auto element = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:(NSURL *)_positionInformation.url imageURL:(NSURL *)_positionInformation.imageURL location:_positionInformation.request.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:nil]);
>+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>     [uiDelegate _webView:_webView showCustomSheetForElement:element.get()];
>+    ALLOW_DEPRECATED_DECLARATIONS_END
> }
> 
> - (void)_showLinkSheet
>@@ -6123,6 +6125,7 @@ static BOOL allPasteboardItemOriginsMatchOrigin(UIPasteboard *pasteboard, const
>     id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
>     
>     if ([uiDelegate respondsToSelector:@selector(_webView:showCustomSheetForElement:)]) {
>+        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>         if ([uiDelegate _webView:_webView showCustomSheetForElement:element]) {
> #if ENABLE(DATA_INTERACTION)
>             BOOL shouldCancelAllTouches = !_dragDropInteractionState.dragSession();
>@@ -6130,14 +6133,13 @@ static BOOL allPasteboardItemOriginsMatchOrigin(UIPasteboard *pasteboard, const
>             BOOL shouldCancelAllTouches = YES;
> #endif
> 
>-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>             // Prevent tap-and-hold and panning.
>             if (shouldCancelAllTouches)
>                 [UIApp _cancelAllTouches];
>-ALLOW_DEPRECATED_DECLARATIONS_END
> 
>             return YES;
>         }
>+        ALLOW_DEPRECATED_DECLARATIONS_END
>     }
> 
>     return NO;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e14b12394b510c1278ff483b17d556a5fbff8a48..cfde05c7dd53acf1c2e3965bf3d548b8ca336a36 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-28  Alex Christensen  <achristensen@webkit.org>
>+
>+        Deprecate _webView:showCustomSheetForElement: after transition to UIContextMenuInteraction
>+        https://bugs.webkit.org/show_bug.cgi?id=199296
>+        <rdar://problem/51041960>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
>+        (-[DragAndDropSimulator _webView:showCustomSheetForElement:]):
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>diff --git a/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm b/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm
>index 96d6ecbbaaad43898564ed42aa4a92bcb0efc9c2..b2157e0c70d6a53a6218e4d2a909c76822760de2 100644
>--- a/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm
>+++ b/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm
>@@ -815,7 +815,9 @@ IGNORE_WARNINGS_END
>     return self.convertItemProvidersBlock ? self.convertItemProvidersBlock(itemProvider, representingObjects, additionalData) : @[ itemProvider ];
> }
> 
>+IGNORE_WARNINGS_BEGIN("deprecated-implementations")
> - (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element
>+IGNORE_WARNINGS_END
> {
>     if (!self.showCustomActionSheetBlock)
>         return NO;

Actions: View | Formatted Diff | Diff

Attachments on bug 199296: 373062 | 373064 | 373065 | 373123