Changeset 246531 in webkit

Timestamp:

Jun 17, 2019 7:33:50 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Expose DataDetectors context generation on WKContentViewInteraction
​https://bugs.webkit.org/show_bug.cgi?id=198950
<rdar://problem/51116021>

Reviewed by Andy Estes.

• UIProcess/ios/WKActionSheetAssistant.h:
• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant currentPositionInformation]):
(-[WKActionSheetAssistant showDataDetectorsSheet]):

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView dataDetectionContextForPositionInformation:]):
(-[WKContentView dataDetectionContextForActionSheetAssistant:]):
For use by other clients, add -dataDetectionContextForPositionInformation:
and make -dataDetectionContextForActionSheetAssistant: use it.
Also, pull the code to augment the context with surrounding text out of
from WKActionSheetAssistant.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKActionSheetAssistant.h (modified) (1 diff)
• UIProcess/ios/WKActionSheetAssistant.mm (modified) (3 diffs)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-17  Tim Horton  <timothy_horton@apple.com>
+
+        Expose DataDetectors context generation on WKContentViewInteraction
+        https://bugs.webkit.org/show_bug.cgi?id=198950
+        <rdar://problem/51116021>
+
+        Reviewed by Andy Estes.
+
+        * UIProcess/ios/WKActionSheetAssistant.h:
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant currentPositionInformation]):
+        (-[WKActionSheetAssistant showDataDetectorsSheet]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView dataDetectionContextForPositionInformation:]):
+        (-[WKContentView dataDetectionContextForActionSheetAssistant:]):
+        For use by other clients, add -dataDetectionContextForPositionInformation:
+        and make -dataDetectionContextForActionSheetAssistant: use it.
+        Also, pull the code to augment the context with surrounding text out of
+        from WKActionSheetAssistant.
+
 2019-06-17  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h

@@ -83 +83 @@
 - (void)interactionDidStartWithPositionInformation:(const WebKit::InteractionInformationAtPosition&)information;
 - (NSArray *)currentAvailableActionTitles;
+- (Optional<WebKit::InteractionInformationAtPosition>)currentPositionInformation;
 @end
 

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

@@ -326 +326 @@
 }
 
+- (Optional<WebKit::InteractionInformationAtPosition>)currentPositionInformation
+{
+    return _positionInformation;
+}
+
 - (void)_createSheetWithElementActions:(NSArray *)actions defaultTitle:(NSString *)defaultTitle showLinkTitle:(BOOL)showLinkTitle
 {
@@ -647 +652 @@
     NSDictionary *context = nil;
     NSString *textAtSelection = nil;
-    RetainPtr<NSMutableDictionary> extendedContext;
 
     if ([_delegate respondsToSelector:@selector(dataDetectionContextForActionSheetAssistant:)])
@@ -653 +657 @@
     if ([_delegate respondsToSelector:@selector(selectedTextForActionSheetAssistant:)])
         textAtSelection = [_delegate selectedTextForActionSheetAssistant:self];
-    if (!_positionInformation->textBefore.isEmpty() || !_positionInformation->textAfter.isEmpty()) {
-        extendedContext = adoptNS([@{
-            getkDataDetectorsLeadingText() : _positionInformation->textBefore,
-            getkDataDetectorsTrailingText() : _positionInformation->textAfter,
-        } mutableCopy]);
-        
-        if (context)
-            [extendedContext addEntriesFromDictionary:context];
-        context = extendedContext.get();
-    }
 
     if ([controller respondsToSelector:@selector(shouldImmediatelyLaunchDefaultActionForURL:)] && [controller shouldImmediatelyLaunchDefaultActionForURL:targetURL]) {

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -471 +471 @@
 - (WKFormInputSession *)_formInputSession;
 - (void)_didChangeWebViewEditability;
+- (NSDictionary *)dataDetectionContextForPositionInformation:(WebKit::InteractionInformationAtPosition)positionInformation;
 
 - (void)willFinishIgnoringCalloutBarFadeAfterPerformingAction;

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

@@ -6140 +6140 @@
 }
 
-- (NSDictionary *)dataDetectionContextForActionSheetAssistant:(WKActionSheetAssistant *)assistant
-{
-    NSDictionary *context = nil;
+- (NSDictionary *)dataDetectionContextForPositionInformation:(WebKit::InteractionInformationAtPosition)positionInformation
+{
+    RetainPtr<NSMutableDictionary> context;
     id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
     if ([uiDelegate respondsToSelector:@selector(_dataDetectionContextForWebView:)])
-        context = [uiDelegate _dataDetectionContextForWebView:_webView];
-    return context;
+        context = adoptNS([[uiDelegate _dataDetectionContextForWebView:_webView] mutableCopy]);
+    
+    if (!context)
+        context = adoptNS([[NSMutableDictionary alloc] init]);
+    
+    if (!positionInformation.textBefore.isEmpty())
+        context.get()[getkDataDetectorsLeadingText()] = positionInformation.textBefore;
+    if (!positionInformation.textAfter.isEmpty())
+        context.get()[getkDataDetectorsTrailingText()] = positionInformation.textAfter;
+    
+    return context.autorelease();
+}
+
+- (NSDictionary *)dataDetectionContextForActionSheetAssistant:(WKActionSheetAssistant *)assistant
+{
+    return [self dataDetectionContextForPositionInformation:assistant.currentPositionInformation.valueOr(_positionInformation)];
 }