<!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>[191805] trunk/Source</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/191805">191805</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-10-30 12:38:40 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tapping and holding a link should have a share option
https://bugs.webkit.org/show_bug.cgi?id=150693
-and corresponding-
rdar://problem/21319702
Reviewed by Tim Horton.
Source/WebCore:
* English.lproj/Localizable.strings:
Source/WebKit2:
New _WKElementActionType called _WKElementActionTypeShare.
* UIProcess/API/Cocoa/_WKElementAction.h:
* UIProcess/API/Cocoa/_WKElementAction.mm:
(+[_WKElementAction _elementActionWithType:customTitle:assistant:]):
_WKElementActionTypeShare is part of the default actions for links.
* UIProcess/ios/WKActionSheetAssistant.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
Handle the sharing part!
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
To support this in PDF, PDF need to create a _webSelectionAssistant.
* UIProcess/ios/WKPDFView.mm:
(-[WKPDFView web_initWithFrame:webView:]):
(-[WKPDFView actionSheetAssistant:openElementAtLocation:]):
(-[WKPDFView actionSheetAssistant:shareElementWithURL:rect:]):
(-[WKPDFView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKElementActionh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKElementActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheetAssistanth">trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm">trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKPDFViewmm">trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebCore/ChangeLog 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-30 Beth Dakin <bdakin@apple.com>
+
+ Tapping and holding a link should have a share option
+ https://bugs.webkit.org/show_bug.cgi?id=150693
+ -and corresponding-
+ rdar://problem/21319702
+
+ Reviewed by Tim Horton.
+
+ * English.lproj/Localizable.strings:
+
</ins><span class="cx"> 2015-10-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Minor CGColor leaks seen on bots allocated in WebSystemBackdropLayer.mm
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -496,6 +496,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Set Writing Direction (Undo action name)" = "Set Writing Direction";
</span><span class="cx">
</span><ins>+/* Title for Share action button */
+"Share…" = "Share…";
+
</ins><span class="cx"> /* Show colors context menu item */
</span><span class="cx"> "Show Colors" = "Show Colors";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-10-30 Beth Dakin <bdakin@apple.com>
+
+ Tapping and holding a link should have a share option
+ https://bugs.webkit.org/show_bug.cgi?id=150693
+ -and corresponding-
+ rdar://problem/21319702
+
+ Reviewed by Tim Horton.
+
+ New _WKElementActionType called _WKElementActionTypeShare.
+ * UIProcess/API/Cocoa/_WKElementAction.h:
+ * UIProcess/API/Cocoa/_WKElementAction.mm:
+ (+[_WKElementAction _elementActionWithType:customTitle:assistant:]):
+
+ _WKElementActionTypeShare is part of the default actions for links.
+ * UIProcess/ios/WKActionSheetAssistant.h:
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
+
+ Handle the sharing part!
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView actionSheetAssistant:shareElementWithURL:rect:]):
+
+ To support this in PDF, PDF need to create a _webSelectionAssistant.
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView web_initWithFrame:webView:]):
+ (-[WKPDFView actionSheetAssistant:openElementAtLocation:]):
+ (-[WKPDFView actionSheetAssistant:shareElementWithURL:rect:]):
+ (-[WKPDFView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):
+
</ins><span class="cx"> 2015-10-30 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKElementActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> _WKElementActionTypeAddToReadingList,
</span><span class="cx"> _WKElementActionTypeOpenInDefaultBrowser WK_ENUM_AVAILABLE(NA, 9_0),
</span><span class="cx"> _WKElementActionTypeOpenInExternalApplication WK_ENUM_AVAILABLE(NA, 9_0),
</span><ins>+ _WKElementActionTypeShare WK_ENUM_AVAILABLE(NA, WK_IOS_TBA),
</ins><span class="cx"> #endif
</span><span class="cx"> } WK_ENUM_AVAILABLE(10_10, 8_0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKElementActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -127,6 +127,12 @@
</span><span class="cx"> };
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+ case _WKElementActionTypeShare:
+ title = WEB_UI_STRING("Share…", "Title for Share action button");
+ handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) {
+ [assistant.delegate actionSheetAssistant:assistant shareElementWithURL:actionInfo.URL rect:actionInfo.boundingRect];
+ };
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"There is no standard web element action of type %ld.", (long)type];
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistanth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> - (const WebKit::InteractionInformationAtPosition&)positionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant;
</span><span class="cx"> - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant performAction:(WebKit::SheetAction)action;
</span><span class="cx"> - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant openElementAtLocation:(CGPoint)location;
</span><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect;
</ins><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="cx"> - (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -343,8 +343,10 @@
</span><span class="cx"> if ([getSSReadingListClass() supportsURL:targetURL])
</span><span class="cx"> [defaultActions addObject:[_WKElementAction _elementActionWithType:_WKElementActionTypeAddToReadingList assistant:self]];
</span><span class="cx"> #endif
</span><del>- if (![[targetURL scheme] length] || [[targetURL scheme] caseInsensitiveCompare:@"javascript"] != NSOrderedSame)
</del><ins>+ if (![[targetURL scheme] length] || [[targetURL scheme] caseInsensitiveCompare:@"javascript"] != NSOrderedSame) {
</ins><span class="cx"> [defaultActions addObject:[_WKElementAction _elementActionWithType:_WKElementActionTypeCopy assistant:self]];
</span><ins>+ [defaultActions addObject:[_WKElementAction _elementActionWithType:_WKElementActionTypeShare assistant:self]];
+ }
</ins><span class="cx">
</span><span class="cx"> return defaultActions;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -3370,6 +3370,14 @@
</span><span class="cx"> [self _attemptClickAtLocation:location];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect
+{
+ if (_textSelectionAssistant)
+ [_textSelectionAssistant showShareSheetFor:url.absoluteString fromRect:boundingRect];
+ else if (_webSelectionAssistant)
+ [_webSelectionAssistant showShareSheetFor:url.absoluteString fromRect:boundingRect];
+}
+
</ins><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="cx"> - (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm (191804 => 191805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-10-30 19:09:13 UTC (rev 191804)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-10-30 19:38:40 UTC (rev 191805)
</span><span class="lines">@@ -105,6 +105,8 @@
</span><span class="cx"> _WKFindOptions _nextCachedFindOptionsAffectingResults;
</span><span class="cx">
</span><span class="cx"> dispatch_queue_t _findQueue;
</span><ins>+
+ RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)web_initWithFrame:(CGRect)frame webView:(WKWebView *)webView
</span><span class="lines">@@ -718,6 +720,13 @@
</span><span class="cx"> _webView->_page->navigateToPDFLinkWithSimulatedClick(_positionInformation.url, roundedIntPoint(location), roundedIntPoint(screenPoint));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect
+{
+ _webSelectionAssistant = adoptNS([[UIWKSelectionAssistant alloc] initWithView:self]);
+ [_webSelectionAssistant showShareSheetFor:url.absoluteString fromRect:boundingRect];
+ _webSelectionAssistant = nil;
+}
+
</ins><span class="cx"> #if HAVE(APP_LINKS)
</span><span class="cx"> - (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>