Title: [248456] trunk/Source/WebKit
Revision
248456
Author
[email protected]
Date
2019-08-08 19:11:18 -0700 (Thu, 08 Aug 2019)

Log Message

REGRESSION (52279987): Most of the WKUIDelegate contextMenu delegate methods are not being called
https://bugs.webkit.org/show_bug.cgi?id=200557
<rdar://problem/53717962>

Reviewed by Wenson Hsieh.

UIKit changed the name of delegates recently. We ignored the warning because
it was still calling the old methods. However, it will only do so for applications
authored by Apple, breaking 3rd parties.

The change here is just adopting the new methods in place of the old ones.
It does not change the API that WebKit vends (they still use the older names).

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView contextMenuInteraction:willDisplayMenuForConfiguration:animator:]):
(-[WKContentView contextMenuInteraction:willPerformPreviewActionForMenuWithConfiguration:animator:]):
(-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):
(-[WKContentView contextMenuInteractionWillPresent:]): Deleted.
(-[WKContentView contextMenuInteraction:willCommitWithAnimator:]): Deleted.
(-[WKContentView contextMenuInteractionDidEnd:]): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (248455 => 248456)


--- trunk/Source/WebKit/ChangeLog	2019-08-09 01:57:49 UTC (rev 248455)
+++ trunk/Source/WebKit/ChangeLog	2019-08-09 02:11:18 UTC (rev 248456)
@@ -1,3 +1,26 @@
+2019-08-08  Dean Jackson  <[email protected]>
+
+        REGRESSION (52279987): Most of the WKUIDelegate contextMenu delegate methods are not being called
+        https://bugs.webkit.org/show_bug.cgi?id=200557
+        <rdar://problem/53717962>
+
+        Reviewed by Wenson Hsieh.
+
+        UIKit changed the name of delegates recently. We ignored the warning because
+        it was still calling the old methods. However, it will only do so for applications
+        authored by Apple, breaking 3rd parties.
+
+        The change here is just adopting the new methods in place of the old ones.
+        It does not change the API that WebKit vends (they still use the older names).
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView contextMenuInteraction:willDisplayMenuForConfiguration:animator:]):
+        (-[WKContentView contextMenuInteraction:willPerformPreviewActionForMenuWithConfiguration:animator:]):
+        (-[WKContentView contextMenuInteraction:willEndForConfiguration:animator:]):
+        (-[WKContentView contextMenuInteractionWillPresent:]): Deleted.
+        (-[WKContentView contextMenuInteraction:willCommitWithAnimator:]): Deleted.
+        (-[WKContentView contextMenuInteractionDidEnd:]): Deleted.
+
 2019-08-08  Simon Fraser  <[email protected]>
 
         [iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (248455 => 248456)


--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-08-09 01:57:49 UTC (rev 248455)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-08-09 02:11:18 UTC (rev 248456)
@@ -8204,9 +8204,7 @@
     return [self _createTargetedPreviewIfPossible];
 }
 
-ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
-- (void)contextMenuInteractionWillPresent:(UIContextMenuInteraction *)interaction
-ALLOW_DEPRECATED_IMPLEMENTATIONS_END
+- (void)contextMenuInteraction:(UIContextMenuInteraction *)interaction willDisplayMenuForConfiguration:(UIContextMenuConfiguration *)configuration animator:(id<UIContextMenuInteractionAnimating>)animator
 {
     if (!_webView)
         return;
@@ -8227,9 +8225,7 @@
     return std::exchange(_contextMenuInteractionTargetedPreview, nil).autorelease();
 }
 
-ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
-- (void)contextMenuInteraction:(UIContextMenuInteraction *)interaction willCommitWithAnimator:(id<UIContextMenuInteractionCommitAnimating>)animator
-ALLOW_DEPRECATED_IMPLEMENTATIONS_END
+- (void)contextMenuInteraction:(UIContextMenuInteraction *)interaction willPerformPreviewActionForMenuWithConfiguration:(UIContextMenuConfiguration *)configuration animator:(id<UIContextMenuInteractionCommitAnimating>)animator
 {
     if (!_webView)
         return;
@@ -8282,9 +8278,7 @@
     }
 }
 
-ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
-- (void)contextMenuInteractionDidEnd:(UIContextMenuInteraction *)interaction
-ALLOW_DEPRECATED_IMPLEMENTATIONS_END
+- (void)contextMenuInteraction:(UIContextMenuInteraction *)interaction willEndForConfiguration:(UIContextMenuConfiguration *)configuration animator:(nullable id<UIContextMenuInteractionAnimating>)animator
 {
     if (!_webView)
         return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to