Changeset 248460 in webkit

Timestamp:

Aug 8, 2019, 10:01:26 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r248456. rdar://problem/54109878

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@248456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

branches/safari-608.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-08  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248456. rdar://problem/54109878
+
+    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.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-08  Dean Jackson  <dino@apple.com>
+
+            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  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -8172 +8172 @@
 }
 
-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)
@@ -8195 +8193 @@
 }
 
-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)
@@ -8250 +8246 @@
 }
 
-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)