Attachment 373062 Details for Bug 199296 – Patch

[patch] Patch

bug-199296-20190627160239.patch (text/plain), 4.56 KB, created by Alex Christensen on 2019-06-27 16:02:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-27 16:02:39 PDT

Size: 4.56 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..1c1903c1ec2f3e59dab18eaec6174a3cb5f4abf7 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
>@@ -156,7 +156,7 @@ 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:", 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));
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 33938e495dfeb5b35d950d41cae488b982b2490f..289cd537dea45dab14d8bb3c79b02f2ed62b5a8f 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;
>@@ -7742,6 +7744,9 @@ static NSString *titleForMenu(bool isLink, bool showLinkPreviews, const URL& url
>     if (!_positionInformation.isLink && !_positionInformation.isImage && !_positionInformation.isAttachment)
>         return completion(nil);
> 
>+    if (_positionInformation.isAttachment)
>+        [self _showAttachmentSheet];
>+
>     URL linkURL = _positionInformation.url;
> 
>     if (_positionInformation.isLink && linkURL.isEmpty())

Actions: View | Formatted Diff | Diff

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