Attachment 372852 Details for Bug 199198 – Patch

[patch] Patch

bug-199198-20190625130306.patch (text/plain), 2.36 KB, created by Tim Horton on 2019-06-25 13:03:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-06-25 13:03:06 PDT

Size: 2.36 KB

patch

obsolete

>Subversion Revision: 246781
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 4e8cb65c9819b9e105671ae00456b75159f7caed..4a6fd6d01fb527618e7a3fd4236e45b49de1f8df 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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-24  Brady Eidson  <beidson@apple.com>
> 
>         Null deref in WebFrameLoaderClient::dispatchDidReceiveServerRedirectForProvisionalLoad.
>diff --git a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
>index b33a3b601acb6a83b963ef24e8841644bdc9f7e8..b6ebb8c3b3e0b10f59904a1f7dbbe59a66bdc4fa 100644
>--- a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
>+++ b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
>@@ -658,7 +658,7 @@ - (void)showDataDetectorsSheet
>         textAtSelection = [_delegate selectedTextForActionSheetAssistant:self];
> 
>     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];
>         return;
>@@ -675,7 +675,7 @@ - (void)showDataDetectorsSheet
>         [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;

Actions: View | Formatted Diff | Diff

Attachments on bug 199198: 372852