Title: [248571] branches/safari-608-branch/Source/WebKit
- Revision
- 248571
- Author
- [email protected]
- Date
- 2019-08-12 16:42:25 -0700 (Mon, 12 Aug 2019)
Log Message
Cherry-pick r248456. rdar://problem/54109877
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
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (248570 => 248571)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-12 23:42:23 UTC (rev 248570)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-12 23:42:25 UTC (rev 248571)
@@ -1,5 +1,55 @@
2019-08-12 Alan Coon <[email protected]>
+ Cherry-pick r248456. rdar://problem/54109877
+
+ 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 <[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-12 Alan Coon <[email protected]>
+
Cherry-pick r248455. rdar://problem/54109872
[iOS WK2] Hide previews when an inner overflow or frame scrollview scrolls
Modified: branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (248570 => 248571)
--- branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-08-12 23:42:23 UTC (rev 248570)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-08-12 23:42:25 UTC (rev 248571)
@@ -8191,9 +8191,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;
@@ -8214,9 +8212,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;
@@ -8269,9 +8265,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
