<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[244553] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/244553">244553</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2019-04-23 11:15:39 -0700 (Tue, 23 Apr 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>Action sheet shares a stringified URL instead of a URL object
https://bugs.webkit.org/show_bug.cgi?id=197185
<rdar://problem/49962249>
Reviewed by Darin Adler.
* UIProcess/Cocoa/WKShareSheet.h:
* UIProcess/Cocoa/WKShareSheet.mm:
(-[WKShareSheet presentWithParameters:inRect:completionHandler:]):
(-[WKShareSheet presentWithParameters:completionHandler:]): Deleted.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::showShareSheet):
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::showShareSheet):
Make it possible to optionally provide WKShareSheet with
a rect to present relative to.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showShareSheet:inRect:completionHandler:]):
(-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
(-[WKContentView _showShareSheet:completionHandler:]): Deleted.
Instead of stringifying the URL and using the text selection assistant's
share method, hand WKShareSheet a proper URL.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWKShareSheeth">trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWKShareSheetmm">trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebViewImplmm">trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPageClientImplIOSmm">trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/ChangeLog 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2019-04-23 Tim Horton <timothy_horton@apple.com>
+
+ Action sheet shares a stringified URL instead of a URL object
+ https://bugs.webkit.org/show_bug.cgi?id=197185
+ <rdar://problem/49962249>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/Cocoa/WKShareSheet.h:
+ * UIProcess/Cocoa/WKShareSheet.mm:
+ (-[WKShareSheet presentWithParameters:inRect:completionHandler:]):
+ (-[WKShareSheet presentWithParameters:completionHandler:]): Deleted.
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::showShareSheet):
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::showShareSheet):
+ Make it possible to optionally provide WKShareSheet with
+ a rect to present relative to.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _showShareSheet:inRect:completionHandler:]):
+ (-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
+ (-[WKContentView _showShareSheet:completionHandler:]): Deleted.
+ Instead of stringifying the URL and using the text selection assistant's
+ share method, hand WKShareSheet a proper URL.
+
</ins><span class="cx"> 2019-04-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS] element.focus() sometimes fails to reveal the focused element when it becomes editable dynamically
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWKShareSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.h (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.h 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.h 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithView:(WKWebView *)view;
</span><span class="cx">
</span><del>-- (void)presentWithParameters:(const WebCore::ShareDataWithParsedURL&)data completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
</del><ins>+- (void)presentWithParameters:(const WebCore::ShareDataWithParsedURL&)data inRect:(WTF::Optional<WebCore::FloatRect>)rect completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
</ins><span class="cx"> - (void)dismiss;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, weak) id <WKShareSheetDelegate> delegate;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWKShareSheetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)presentWithParameters:(const WebCore::ShareDataWithParsedURL &)data completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler
</del><ins>+- (void)presentWithParameters:(const WebCore::ShareDataWithParsedURL &)data inRect:(WTF::Optional<WebCore::FloatRect>)rect completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler
</ins><span class="cx"> {
</span><span class="cx"> auto shareDataArray = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx">
</span><span class="lines">@@ -103,12 +103,17 @@
</span><span class="cx">
</span><span class="cx"> // WKShareSheet can be released under NSSharingServicePicker delegate callbacks.
</span><span class="cx"> RetainPtr<WKShareSheet> protector(self);
</span><del>-
- NSPoint location = [NSEvent mouseLocation];
- NSRect mouseLocationRect = NSMakeRect(location.x, location.y, 1.0, 1.0);
- NSRect mouseLocationInWindow = [webView.window convertRectFromScreen:mouseLocationRect];
- NSRect mouseLocationInView = [webView convertRect:mouseLocationInWindow fromView:nil];
- [_sharingServicePicker showRelativeToRect:mouseLocationInView ofView:webView preferredEdge:NSMinYEdge];
</del><ins>+ NSRect presentationRect;
+
+ if (rect)
+ presentationRect = *rect;
+ else {
+ NSPoint location = [NSEvent mouseLocation];
+ NSRect mouseLocationRect = NSMakeRect(location.x, location.y, 1.0, 1.0);
+ NSRect mouseLocationInWindow = [webView.window convertRectFromScreen:mouseLocationRect];
+ presentationRect = [webView convertRect:mouseLocationInWindow fromView:nil];
+ }
+ [_sharingServicePicker showRelativeToRect:presentationRect ofView:webView preferredEdge:NSMinYEdge];
</ins><span class="cx"> #else
</span><span class="cx"> _shareSheetViewController = adoptNS([[UIActivityViewController alloc] initWithActivityItems:shareDataArray.get() applicationActivities:nil]);
</span><span class="cx"> [_shareSheetViewController setCompletionWithItemsHandler:^(NSString *, BOOL completed, NSArray *, NSError *) {
</span><span class="lines">@@ -117,7 +122,11 @@
</span><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> UIPopoverPresentationController *popoverController = [_shareSheetViewController popoverPresentationController];
</span><del>- popoverController._centersPopoverIfSourceViewNotSet = YES;
</del><ins>+ if (rect) {
+ popoverController.sourceView = webView;
+ popoverController.sourceRect = *rect;
+ } else
+ popoverController._centersPopoverIfSourceViewNotSet = YES;
</ins><span class="cx">
</span><span class="cx"> _presentationViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:webView];
</span><span class="cx"> [_presentationViewController presentViewController:_shareSheetViewController.get() animated:YES completion:nil];
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -2782,7 +2782,7 @@
</span><span class="cx"> _shareSheet = adoptNS([[WKShareSheet alloc] initWithView:view]);
</span><span class="cx"> [_shareSheet setDelegate:view];
</span><span class="cx">
</span><del>- [_shareSheet presentWithParameters:data completionHandler:WTFMove(completionHandler)];
</del><ins>+ [_shareSheet presentWithParameters:data inRect:WTF::nullopt completionHandler:WTFMove(completionHandler)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::shareSheetDidDismiss(WKShareSheet *shareSheet)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::showShareSheet(const ShareDataWithParsedURL& shareData, WTF::CompletionHandler<void(bool)>&& completionHandler)
</span><span class="cx"> {
</span><del>- [m_contentView _showShareSheet:shareData completionHandler:WTFMove(completionHandler)];
</del><ins>+ [m_contentView _showShareSheet:shareData inRect:WTF::nullopt completionHandler:WTFMove(completionHandler)];
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> - (void)_scrollingNodeScrollingDidEnd;
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)policy routingContextUID:(NSString *)contextUID;
</span><span class="cx"> - (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
</span><del>-- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)shareData completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
</del><ins>+- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)shareData inRect:(WTF::Optional<WebCore::FloatRect>)rect completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
</ins><span class="cx"> - (void)dismissFilePicker;
</span><span class="cx"> - (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled;
</span><span class="cx"> - (Vector<WebKit::OptionItem>&) focusedSelectElementOptions;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (244552 => 244553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-04-23 18:06:29 UTC (rev 244552)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-04-23 18:15:39 UTC (rev 244553)
</span><span class="lines">@@ -5793,7 +5793,7 @@
</span><span class="cx"> _fileUploadPanel = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)data completionHandler:(CompletionHandler<void(bool)>&&)completionHandler
</del><ins>+- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)data inRect:(WTF::Optional<WebCore::FloatRect>)rect completionHandler:(CompletionHandler<void(bool)>&&)completionHandler
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
</span><span class="cx"> if (_shareSheet)
</span><span class="lines">@@ -5802,7 +5802,7 @@
</span><span class="cx"> _shareSheet = adoptNS([[WKShareSheet alloc] initWithView:_webView]);
</span><span class="cx"> [_shareSheet setDelegate:self];
</span><span class="cx">
</span><del>- [_shareSheet presentWithParameters:data completionHandler:WTFMove(completionHandler)];
</del><ins>+ [_shareSheet presentWithParameters:data inRect:rect completionHandler:WTFMove(completionHandler)];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5903,8 +5903,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect
</span><span class="cx"> {
</span><del>- if (_textSelectionAssistant)
- [_textSelectionAssistant showShareSheetFor:WTF::userVisibleString(url) fromRect:boundingRect];
</del><ins>+ WebCore::ShareDataWithParsedURL shareData;
+ shareData.url = { url };
+ [self _showShareSheet:shareData inRect: { [self convertRect:boundingRect toView:_webView] } completionHandler:[] (bool success) { }];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(APP_LINKS)
</span></span></pre>
</div>
</div>
</body>
</html>