Changeset 233589 in webkit

Timestamp:

Jul 6, 2018, 1:13:22 PM (8 years ago)

Author:

aestes@apple.com

Message:

[iOS] WKPDFView should show the Data Detectors sheet when long-pressing a URL that Data Detectors can handle
​https://bugs.webkit.org/show_bug.cgi?id=187396
<rdar://problem/41786980>

Reviewed by Dan Bernstein.

If a URL can be presented by Data Detectors, show the Data Detectors sheet instead
of the link sheet. Also implement the optional WKActionSheetAssistantDelegate
method that asks the UI delegate for its data detection context.

• UIProcess/ios/WKPDFView.mm:

(-[WKPDFView _showActionSheetForURL:atLocation:withAnnotationRect:]):
(-[WKPDFView dataDetectionContextForActionSheetAssistant:]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-06  Andy Estes  <aestes@apple.com>
+
+        [iOS] WKPDFView should show the Data Detectors sheet when long-pressing a URL that Data Detectors can handle
+        https://bugs.webkit.org/show_bug.cgi?id=187396
+        <rdar://problem/41786980>
+
+        Reviewed by Dan Bernstein.
+
+        If a URL can be presented by Data Detectors, show the Data Detectors sheet instead
+        of the link sheet. Also implement the optional WKActionSheetAssistantDelegate
+        method that asks the UI delegate for its data detection context.
+
+        * UIProcess/ios/WKPDFView.mm:
+        (-[WKPDFView _showActionSheetForURL:atLocation:withAnnotationRect:]):
+        (-[WKPDFView dataDetectionContextForActionSheetAssistant:]):
+
 2018-07-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm

@@ -33 +33 @@
 #import "PDFKitSPI.h"
 #import "WKActionSheetAssistant.h"
+#import "WKUIDelegatePrivate.h"
 #import "WKWebViewInternal.h"
 #import "WebPageProxy.h"
 #import "_WKWebViewPrintFormatterInternal.h"
 #import <MobileCoreServices/MobileCoreServices.h>
+#import <WebCore/DataDetection.h>
 #import <WebCore/WebCoreNSURLExtras.h>
 #import <wtf/BlockPtr.h>
@@ -440 +442 @@
 
     _positionInformation = WTFMove(positionInformation);
-    [_actionSheetAssistant showLinkSheet];
+#if ENABLE(DATA_DETECTION)
+    if (WebCore::DataDetection::canBePresentedByDataDetectors(_positionInformation.url))
+        [_actionSheetAssistant showDataDetectorsSheet];
+    else
+#endif
+        [_actionSheetAssistant showLinkSheet];
 }
 
@@ -514 +521 @@
 }
 
+- (NSDictionary *)dataDetectionContextForActionSheetAssistant:(WKActionSheetAssistant *)assistant
+{
+    auto webView = _webView.getAutoreleased();
+    if (!webView)
+        return nil;
+
+    id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>(webView.UIDelegate);
+    if (![uiDelegate respondsToSelector:@selector(_dataDetectionContextForWebView:)])
+        return nil;
+
+    return [uiDelegate _dataDetectionContextForWebView:webView];
+}
+
 @end