Changeset 246805 in webkit

Timestamp:

Jun 25, 2019 1:51:12 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Wrong title for Data Detectors tap action menu
​https://bugs.webkit.org/show_bug.cgi?id=199198
<rdar://problem/51957842>

Reviewed by Wenson Hsieh.

• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant showDataDetectorsSheet]):
Always pass the results array through to DataDetectors; they need it
to figure out the title too!

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKActionSheetAssistant.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-25  Tim Horton  <timothy_horton@apple.com>
+
+        Wrong title for Data Detectors tap action menu
+        https://bugs.webkit.org/show_bug.cgi?id=199198
+        <rdar://problem/51957842>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant showDataDetectorsSheet]):
+        Always pass the results array through to DataDetectors; they need it
+        to figure out the title too!
+
 2019-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -659 +659 @@
 
     if ([controller respondsToSelector:@selector(shouldImmediatelyLaunchDefaultActionForURL:)] && [controller shouldImmediatelyLaunchDefaultActionForURL:targetURL]) {
-        auto action = [controller defaultActionForURL:targetURL results:nil context:context];
+        auto action = [controller defaultActionForURL:targetURL results:_positionInformation->dataDetectorResults.get() context:context];
         auto *elementAction = [self _elementActionForDDAction:action];
         [elementAction _runActionWithElementInfo:_elementInfo.get() forActionSheetAssistant:self];
@@ -676 +676 @@
     }
 
-    NSString *title = [controller titleForURL:targetURL results:nil context:context];
+    NSString *title = [controller titleForURL:targetURL results:_positionInformation->dataDetectorResults.get() context:context];
     [self _createSheetWithElementActions:elementActions defaultTitle:title showLinkTitle:NO];
     if (!_interactionSheet)