Title: [248342] branches/safari-608.1-branch/Source/WebKit
- Revision
- 248342
- Author
- [email protected]
- Date
- 2019-08-06 23:52:08 -0700 (Tue, 06 Aug 2019)
Log Message
Cherry-pick r247657. rdar://problem/54017957
Provide correct names for UIContextMenuInteraction API replacements
https://bugs.webkit.org/show_bug.cgi?id=199966
Reviewed by Tim Horton.
We had some old incorrect names for replacements to SPI. While
here, I reordered and expanded the documentation for the new API.
* UIProcess/API/Cocoa/WKUIDelegate.h:
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247657 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248341 => 248342)
--- branches/safari-608.1-branch/Source/WebKit/ChangeLog 2019-08-07 06:52:05 UTC (rev 248341)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog 2019-08-07 06:52:08 UTC (rev 248342)
@@ -1,5 +1,35 @@
2019-08-06 Kocsen Chung <[email protected]>
+ Cherry-pick r247657. rdar://problem/54017957
+
+ Provide correct names for UIContextMenuInteraction API replacements
+ https://bugs.webkit.org/show_bug.cgi?id=199966
+
+ Reviewed by Tim Horton.
+
+ We had some old incorrect names for replacements to SPI. While
+ here, I reordered and expanded the documentation for the new API.
+
+ * UIProcess/API/Cocoa/WKUIDelegate.h:
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247657 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-19 Dean Jackson <[email protected]>
+
+ Provide correct names for UIContextMenuInteraction API replacements
+ https://bugs.webkit.org/show_bug.cgi?id=199966
+
+ Reviewed by Tim Horton.
+
+ We had some old incorrect names for replacements to SPI. While
+ here, I reordered and expanded the documentation for the new API.
+
+ * UIProcess/API/Cocoa/WKUIDelegate.h:
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+2019-08-06 Kocsen Chung <[email protected]>
+
Cherry-pick r247651. rdar://problem/54017866
[iOS] Entering 2FA code on idmsa.apple.com causes unexpected scrolling
Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h (248341 => 248342)
--- branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-08-07 06:52:05 UTC (rev 248341)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h 2019-08-07 06:52:08 UTC (rev 248342)
@@ -174,27 +174,28 @@
- (void)webView:(WKWebView *)webView contextMenuConfigurationForElement:(WKContextMenuElementInfo *)elementInfo completionHandler:(void (^)(UIContextMenuConfiguration * _Nullable configuration))completionHandler WK_API_AVAILABLE(ios(WK_IOS_TBA));
/**
- * @abstract Called when the context menu configured by the UIContextMenuConfiguration from
- * webView:contextMenuConfigurationForElement:completionHandler: is committed.
+ * @abstract Called when the context menu will be presented.
*
* @param webView The web view invoking the delegate method.
* @param elementInfo The elementInfo for the element the user is touching.
- * @param animator The animator to use for the commit animation.
*/
-- (void)webView:(WKWebView *)webView contextMenuForElement:(WKContextMenuElementInfo *)elementInfo willCommitWithAnimator:(id<UIContextMenuInteractionCommitAnimating>)animator WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (void)webView:(WKWebView *)webView contextMenuWillPresentForElement:(WKContextMenuElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
/**
- * @abstract Called when the context menu will be presented.
+ * @abstract Called when the context menu configured by the UIContextMenuConfiguration from
+ * webView:contextMenuConfigurationForElement:completionHandler: is committed. That is, when
+ * the user has selected the view provided in the UIContextMenuContentPreviewProvider.
*
* @param webView The web view invoking the delegate method.
* @param elementInfo The elementInfo for the element the user is touching.
+ * @param animator The animator to use for the commit animation.
*/
-- (void)webView:(WKWebView *)webView contextMenuWillPresentForElement:(WKContextMenuElementInfo *)elementInfo WK_API_AVAILABLE(ios(WK_IOS_TBA));
+- (void)webView:(WKWebView *)webView contextMenuForElement:(WKContextMenuElementInfo *)elementInfo willCommitWithAnimator:(id <UIContextMenuInteractionCommitAnimating>)animator WK_API_AVAILABLE(ios(WK_IOS_TBA));
/**
- * @abstract Called when the context menu ends.
+ * @abstract Called when the context menu ends, either by being dismissed or when a menu action is taken.
*
* @param webView The web view invoking the delegate method.
* @param elementInfo The elementInfo for the element the user is touching.
Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (248341 => 248342)
--- branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2019-08-07 06:52:05 UTC (rev 248341)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2019-08-07 06:52:08 UTC (rev 248342)
@@ -144,11 +144,11 @@
- (void)_webView:(WKWebView *)webView requestGeolocationAuthorizationForURL:(NSURL *)url frame:(WKFrameInfo *)frame decisionHandler:(void (^)(BOOL authorized))decisionHandler WK_API_AVAILABLE(ios(11.0));
- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
-- (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:commitContextMenu:", ios(9.0, WK_IOS_TBA));
+- (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuForElement:willCommitWithAnimator:", ios(9.0, WK_IOS_TBA));
- (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuConfigurationForElement:completionHandler:", ios(9.0, WK_IOS_TBA));
-- (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_API_DEPRECATED_WITH_REPLACEMENT("webView:commitContextMenu:", ios(9.0, WK_IOS_TBA));
-- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_API_DEPRECATED_WITH_REPLACEMENT("webView:dismissContextMenu:", ios(9.0, WK_IOS_TBA));
-- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:dismissContextMenu:", ios(9.0, WK_IOS_TBA));
+- (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuForElement:willCommitWithAnimator:", ios(9.0, WK_IOS_TBA));
+- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuDidEndForElement:", ios(9.0, WK_IOS_TBA));
+- (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_API_DEPRECATED_WITH_REPLACEMENT("webView:contextMenuDidEndForElement:", ios(9.0, WK_IOS_TBA));
#if TARGET_OS_IOS
// This needs to be removed once there is an API version to continue to do callbacks for image element context menus.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
