Title: [246805] trunk/Source/WebKit
- Revision
- 246805
- Author
- timothy_hor...@apple.com
- Date
- 2019-06-25 13:51:12 -0700 (Tue, 25 Jun 2019)
Log 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!
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246804 => 246805)
--- trunk/Source/WebKit/ChangeLog 2019-06-25 20:48:36 UTC (rev 246804)
+++ trunk/Source/WebKit/ChangeLog 2019-06-25 20:51:12 UTC (rev 246805)
@@ -1,3 +1,16 @@
+2019-06-25 Tim Horton <timothy_hor...@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_hs...@apple.com>
[iOS] Occasional crash under -[UIPreviewTarget initWithContainer:center:transform:] when generating a drag preview
Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (246804 => 246805)
--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2019-06-25 20:48:36 UTC (rev 246804)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2019-06-25 20:51:12 UTC (rev 246805)
@@ -658,7 +658,7 @@
textAtSelection = [_delegate selectedTextForActionSheetAssistant:self];
if ([controller respondsToSelector:@selector(shouldImmediatelyLaunchDefaultActionForURL:)] && [controller shouldImmediatelyLaunchDefaultActionForURL:targetURL]) {
- auto action = "" defaultActionForURL:targetURL results:nil context:context];
+ auto action = "" defaultActionForURL:targetURL results:_positionInformation->dataDetectorResults.get() context:context];
auto *elementAction = [self _elementActionForDDAction:action];
[elementAction _runActionWithElementInfo:_elementInfo.get() forActionSheetAssistant:self];
return;
@@ -675,7 +675,7 @@
[elementActions addObject:elementAction];
}
- 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)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes