Title: [279817] trunk/Source/WebKit
Revision
279817
Author
[email protected]
Date
2021-07-11 16:41:03 -0700 (Sun, 11 Jul 2021)

Log Message

Remove an unused deprecated private UI delegate method
https://bugs.webkit.org/show_bug.cgi?id=227861

Reviewed by Tim Horton.

`-_webView:didNotHandleTapAsMeaningfulClickAtPoint:` is replaced with `-_webView:didTapAtPoint:withResult:`;
the old SPI is no longer required for either binary or source compatibility after rdar://79700201.

* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::didTapAtPoint):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (279816 => 279817)


--- trunk/Source/WebKit/ChangeLog	2021-07-11 20:36:50 UTC (rev 279816)
+++ trunk/Source/WebKit/ChangeLog	2021-07-11 23:41:03 UTC (rev 279817)
@@ -1,3 +1,19 @@
+2021-07-11  Wenson Hsieh  <[email protected]>
+
+        Remove an unused deprecated private UI delegate method
+        https://bugs.webkit.org/show_bug.cgi?id=227861
+
+        Reviewed by Tim Horton.
+
+        `-_webView:didNotHandleTapAsMeaningfulClickAtPoint:` is replaced with `-_webView:didTapAtPoint:withResult:`;
+        the old SPI is no longer required for either binary or source compatibility after rdar://79700201.
+
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::didTapAtPoint):
+
 2021-07-10  Myles C. Maxfield  <[email protected]>
 
         [GPU Process] Canvas drawing never releases any fonts

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (279816 => 279817)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2021-07-11 20:36:50 UTC (rev 279816)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h	2021-07-11 23:41:03 UTC (rev 279817)
@@ -165,7 +165,6 @@
 - (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9.0));
 - (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;
 - (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
-- (void)_webView:(WKWebView *)webView didNotHandleTapAsMeaningfulClickAtPoint:(CGPoint)point WK_API_DEPRECATED_WITH_REPLACEMENT("_webView:didTapAtPoint:withResult:", ios(15.0, 15.0));
 - (void)_webView:(WKWebView *)webView didTapAtPoint:(CGPoint)point withResult:(_WKTapHandlingResult)result WK_API_AVAILABLE(ios(15.0));
 - (void)_webView:(WKWebView *)webView requestGeolocationAuthorizationForURL:(NSURL *)url frame:(WKFrameInfo *)frame decisionHandler:(void (^)(BOOL authorized))decisionHandler WK_API_AVAILABLE(ios(11.0));
 - (BOOL)_webView:(WKWebView *)webView fileUploadPanelContentIsManagedWithInitiatingFrame:(WKFrameInfo *)frame;

Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h (279816 => 279817)


--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h	2021-07-11 20:36:50 UTC (rev 279816)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h	2021-07-11 23:41:03 UTC (rev 279817)
@@ -240,7 +240,6 @@
 #endif
         bool webViewActionsForElementDefaultActions : 1;
         bool webViewDidNotHandleTapAsClickAtPoint : 1;
-        bool webViewDidNotHandleTapAsMeaningfulClickAtPoint : 1;
         bool webViewDidTapAtPointWithResult : 1;
         bool presentingViewControllerForWebView : 1;
 #endif

Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (279816 => 279817)


--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	2021-07-11 20:36:50 UTC (rev 279816)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm	2021-07-11 23:41:03 UTC (rev 279817)
@@ -159,7 +159,6 @@
 #endif
     m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
     m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
-    m_delegateMethods.webViewDidNotHandleTapAsMeaningfulClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsMeaningfulClickAtPoint:)];
     m_delegateMethods.webViewDidTapAtPointWithResult = [delegate respondsToSelector:@selector(_webView:didTapAtPoint:withResult:)];
     m_delegateMethods.presentingViewControllerForWebView = [delegate respondsToSelector:@selector(_presentingViewControllerForWebView:)];
 #endif
@@ -1426,12 +1425,6 @@
 
     if (m_uiDelegate->m_delegateMethods.webViewDidTapAtPointWithResult)
         [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate->m_webView.get().get() didTapAtPoint:point withResult:wkTapHandlingResult(result)];
-
-    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    // FIXME: Remove this once all internal clients adopt -_webView:didTapAtPoint:withResult:.
-    if (m_uiDelegate->m_delegateMethods.webViewDidNotHandleTapAsMeaningfulClickAtPoint && result != WebKit::TapHandlingResult::MeaningfulClick)
-        [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate->m_webView.get().get() didNotHandleTapAsMeaningfulClickAtPoint:point];
-    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 
 UIViewController *UIDelegate::UIClient::presentingViewController()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to