Skip to site navigation (Press enter)

[webkit-changes] [248367] branches/safari-608.1-branch/Source/WebKit

kocsen_chung Wed, 07 Aug 2019 09:23:23 -0700

Title: [248367] branches/safari-608.1-branch/Source/WebKit

Revision: 248367
Author: [email protected]
Date: 2019-08-07 09:22:13 -0700 (Wed, 07 Aug 2019)

Log Message

Revert r247657. rdar://problem/54017957


Modified Paths

branches/safari-608.1-branch/Source/WebKit/ChangeLog
branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

Diff

Modified: branches/safari-608.1-branch/Source/WebKit/ChangeLog (248366 => 248367)


--- branches/safari-608.1-branch/Source/WebKit/ChangeLog	2019-08-07 16:08:58 UTC (rev 248366)
+++ branches/safari-608.1-branch/Source/WebKit/ChangeLog	2019-08-07 16:22:13 UTC (rev 248367)
@@ -1,3 +1,7 @@
+2019-08-07  Kocsen Chung  <[email protected]>
+
+        Revert r247657. rdar://problem/54017957
+
 2019-08-06  Kocsen Chung  <[email protected]>
 
         Cherry-pick r248330. rdar://problem/54018116

Modified: branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h (248366 => 248367)


--- branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h	2019-08-07 16:08:58 UTC (rev 248366)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h	2019-08-07 16:22:13 UTC (rev 248367)
@@ -174,28 +174,27 @@
 - (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 will be presented.
+ * @abstract Called when the context menu configured by the UIContextMenuConfiguration from
+ * webView:contextMenuConfigurationForElement:completionHandler: is committed.
  *
  * @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 configured by the UIContextMenuConfiguration from
- * webView:contextMenuConfigurationForElement:completionHandler: is committed. That is, when
- * the user has selected the view provided in the UIContextMenuContentPreviewProvider.
+ * @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 ends, either by being dismissed or when a menu action is taken.
+ * @abstract Called when the context menu ends.
  *
  * @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 (248366 => 248367)


--- branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2019-08-07 16:08:58 UTC (rev 248366)
+++ branches/safari-608.1-branch/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2019-08-07 16:22:13 UTC (rev 248367)
@@ -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:contextMenuForElement:willCommitWithAnimator:", 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 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: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));
+- (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));
 
 #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