<!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>[186719] trunk/Source/WebKit2</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/186719">186719</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-11 15:58:13 -0700 (Sat, 11 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow clients to opt-out of default app link link actions
https://bugs.webkit.org/show_bug.cgi?id=146883
<rdar://problem/21221902>
Reviewed by Dan Bernstein.
* UIProcess/API/APIUIClient.h:
(API::UIClient::shouldIncludeAppLinkActionsForElement):
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::shouldIncludeAppLinkActionsForElement):
Plumbing for a new delegate message to ask the client if they
would like app link actions or not. Default is yes.
* UIProcess/ios/WKActionSheetAssistant.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant showImageSheet]):
(-[WKActionSheetAssistant showLinkSheet]):
(-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
(-[WKActionSheetAssistant defaultActionsForImageSheet:]):
Pass elementInfo into methods generating default actions.
(-[WKActionSheetAssistant _appendOpenActionsForURL:actions:elementInfo:]):
When generating open actions, if the process has AppLink capabilities
ask the client if they want to include AppLink actions or fall back
to the basic Open action.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):
(-[WKContentView previewViewControllerForPosition:inSourceView:]):
* UIProcess/ios/WKPDFView.mm:
(-[WKPDFView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):
Assistant delegate implementations forward to the UIDelegate.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-07-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Allow clients to opt-out of default app link link actions
+ https://bugs.webkit.org/show_bug.cgi?id=146883
+ <rdar://problem/21221902>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::shouldIncludeAppLinkActionsForElement):
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::setDelegate):
+ (WebKit::UIDelegate::UIClient::shouldIncludeAppLinkActionsForElement):
+ Plumbing for a new delegate message to ask the client if they
+ would like app link actions or not. Default is yes.
+
+ * UIProcess/ios/WKActionSheetAssistant.h:
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant showImageSheet]):
+ (-[WKActionSheetAssistant showLinkSheet]):
+ (-[WKActionSheetAssistant defaultActionsForLinkSheet:]):
+ (-[WKActionSheetAssistant defaultActionsForImageSheet:]):
+ Pass elementInfo into methods generating default actions.
+
+ (-[WKActionSheetAssistant _appendOpenActionsForURL:actions:elementInfo:]):
+ When generating open actions, if the process has AppLink capabilities
+ ask the client if they want to include AppLink actions or fall back
+ to the basic Open action.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):
+ (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView actionSheetAssistant:shouldIncludeAppLinkActionsForElement:]):
+ Assistant delegate implementations forward to the UIDelegate.
+
+2015-07-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Update default link action sheets for app links
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146658
</span><span class="cx"> <rdar://problem/21221902>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -159,6 +159,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#if HAVE(APP_LINKS)
+ virtual bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) { return true; }
+#endif
</ins><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return WTF::move(defaultActions); }
</span><span class="cx"> virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> - (void)_webViewDidExitFullscreen:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, 8_3);
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><ins>+- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx"> - (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray *)defaultActions;
</span><span class="cx"> - (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
</span><span class="cx"> - (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -69,10 +69,13 @@
</span><span class="cx"> virtual void exceededDatabaseQuota(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, const WTF::String& databaseName, const WTF::String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentUsage, unsigned long long expectedUsage, std::function<void (unsigned long long)>) override;
</span><span class="cx"> virtual void reachedApplicationCacheOriginQuota(WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, std::function<void (unsigned long long)> completionHandler) override;
</span><span class="cx"> virtual void printFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*) override;
</span><del>- #if PLATFORM(IOS)
</del><ins>+#if PLATFORM(IOS)
+#if HAVE(APP_LINKS)
+ virtual bool shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *) override;
+#endif
</ins><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
</span><span class="cx"> virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
</span><del>- #endif
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> UIDelegate& m_uiDelegate;
</span><span class="cx"> };
</span><span class="lines">@@ -94,6 +97,9 @@
</span><span class="cx"> bool webViewDidEnterFullscreen : 1;
</span><span class="cx"> bool webViewDidExitFullscreen : 1;
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#if HAVE(APP_LINKS)
+ bool webViewShouldIncludeAppLinkActionsForElement : 1;
+#endif
</ins><span class="cx"> bool webViewActionsForElementDefaultActions : 1;
</span><span class="cx"> bool webViewDidNotHandleTapAsClickAtPoint : 1;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> m_delegateMethods.webViewDidEnterFullscreen = [delegate respondsToSelector:@selector(_webViewDidEnterFullscreen:)];
</span><span class="cx"> m_delegateMethods.webViewDidExitFullscreen = [delegate respondsToSelector:@selector(_webViewDidExitFullscreen:)];
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#if HAVE(APP_LINKS)
+ m_delegateMethods.webViewShouldIncludeAppLinkActionsForElement = [delegate respondsToSelector:@selector(_webView:shouldIncludeAppLinkActionsForElement:)];
+#endif
</ins><span class="cx"> m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
</span><span class="cx"> m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
</span><span class="cx"> #endif
</span><span class="lines">@@ -293,6 +296,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#if HAVE(APP_LINKS)
+bool UIDelegate::UIClient::shouldIncludeAppLinkActionsForElement(_WKActivatedElementInfo *elementInfo)
+{
+ if (!m_uiDelegate.m_delegateMethods.webViewShouldIncludeAppLinkActionsForElement)
+ return true;
+
+ auto delegate = m_uiDelegate.m_delegate.get();
+ if (!delegate)
+ return true;
+
+ return [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView shouldIncludeAppLinkActionsForElement:elementInfo];
+}
+#endif
+
</ins><span class="cx"> RetainPtr<NSArray> UIDelegate::UIClient::actionsForElement(_WKActivatedElementInfo *elementInfo, RetainPtr<NSArray> defaultActions)
</span><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewActionsForElementDefaultActions)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistanth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -45,6 +45,9 @@
</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>+#if HAVE(APP_LINKS)
+- (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element;
+#endif
</ins><span class="cx"> - (RetainPtr<NSArray>)actionSheetAssistant:(WKActionSheetAssistant *)assistant decideActionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions;
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="lines">@@ -62,8 +65,8 @@
</span><span class="cx"> - (void)showDataDetectorsSheet;
</span><span class="cx"> - (void)cleanupSheet;
</span><span class="cx"> - (void)updateSheetPosition;
</span><del>-- (RetainPtr<NSArray>)defaultActionsForLinkSheet;
-- (RetainPtr<NSArray>)defaultActionsForImageSheet;
</del><ins>+- (RetainPtr<NSArray>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo;
+- (RetainPtr<NSArray>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> const auto& positionInformation = [delegate positionInformationForActionSheetAssistant:self];
</span><span class="cx">
</span><span class="cx"> NSURL *targetURL = [NSURL _web_URLWithWTFString:positionInformation.url];
</span><del>- auto defaultActions = [self defaultActionsForImageSheet];
</del><span class="cx"> auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
</span><ins>+ auto defaultActions = [self defaultActionsForImageSheet:elementInfo.get()];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSArray> actions = [delegate actionSheetAssistant:self decideActionsForElement:elementInfo.get() defaultActions:WTF::move(defaultActions)];
</span><span class="cx">
</span><span class="lines">@@ -291,10 +291,11 @@
</span><span class="cx"> [self cleanupSheet];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_appendOpenActionsForURL:(NSURL *)url actions:(NSMutableArray *)defaultActions
</del><ins>+- (void)_appendOpenActionsForURL:(NSURL *)url actions:(NSMutableArray *)defaultActions elementInfo:(_WKActivatedElementInfo *)elementInfo
</ins><span class="cx"> {
</span><span class="cx"> #if HAVE(APP_LINKS)
</span><del>- if (applicationHasAppLinkEntitlements()) {
</del><ins>+ ASSERT(_delegate);
+ if (applicationHasAppLinkEntitlements() && [_delegate.get() actionSheetAssistant:self shouldIncludeAppLinkActionsForElement:elementInfo]) {
</ins><span class="cx"> LSAppLink *appLink = appLinkForURL(url);
</span><span class="cx"> if (appLink) {
</span><span class="cx"> NSString *title = WEB_UI_STRING("Open in Safari", "Title for Open in Safari Link action button");
</span><span class="lines">@@ -320,7 +321,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RetainPtr<NSArray>)defaultActionsForLinkSheet
</del><ins>+- (RetainPtr<NSArray>)defaultActionsForLinkSheet:(_WKActivatedElementInfo *)elementInfo
</ins><span class="cx"> {
</span><span class="cx"> auto delegate = _delegate.get();
</span><span class="cx"> if (!delegate)
</span><span class="lines">@@ -333,7 +334,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
</span><del>- [self _appendOpenActionsForURL:targetURL actions:defaultActions.get()];
</del><ins>+ [self _appendOpenActionsForURL:targetURL actions:defaultActions.get() elementInfo:elementInfo];
</ins><span class="cx">
</span><span class="cx"> #if HAVE(SAFARI_SERVICES_FRAMEWORK)
</span><span class="cx"> if ([getSSReadingListClass() supportsURL:targetURL])
</span><span class="lines">@@ -345,7 +346,7 @@
</span><span class="cx"> return defaultActions;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RetainPtr<NSArray>)defaultActionsForImageSheet
</del><ins>+- (RetainPtr<NSArray>)defaultActionsForImageSheet:(_WKActivatedElementInfo *)elementInfo
</ins><span class="cx"> {
</span><span class="cx"> auto delegate = _delegate.get();
</span><span class="cx"> if (!delegate)
</span><span class="lines">@@ -356,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx"> if (!positionInformation.url.isEmpty())
</span><del>- [self _appendOpenActionsForURL:targetURL actions:defaultActions.get()];
</del><ins>+ [self _appendOpenActionsForURL:targetURL actions:defaultActions.get() elementInfo:elementInfo];
</ins><span class="cx">
</span><span class="cx"> #if HAVE(SAFARI_SERVICES_FRAMEWORK)
</span><span class="cx"> if ([getSSReadingListClass() supportsURL:targetURL])
</span><span class="lines">@@ -385,9 +386,8 @@
</span><span class="cx"> if (!targetURL)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto defaultActions = [self defaultActionsForLinkSheet];
- RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink
- URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
</del><ins>+ auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
+ auto defaultActions = [self defaultActionsForLinkSheet:elementInfo.get()];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSArray> actions = [delegate actionSheetAssistant:self decideActionsForElement:elementInfo.get() defaultActions:WTF::move(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 (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -3152,6 +3152,13 @@
</span><span class="cx"> [self _attemptClickAtLocation:location];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(APP_LINKS)
+- (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element
+{
+ return _page->uiClient().shouldIncludeAppLinkActionsForElement(element);
+}
+#endif
+
</ins><span class="cx"> - (RetainPtr<NSArray>)actionSheetAssistant:(WKActionSheetAssistant *)assistant decideActionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions
</span><span class="cx"> {
</span><span class="cx"> return _page->uiClient().actionsForElement(element, WTF::move(defaultActions));
</span><span class="lines">@@ -3215,7 +3222,7 @@
</span><span class="cx"> _highlightLongPressCanClick = NO;
</span><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</span><span class="cx"> _page->startInteractionWithElementAtPosition(_positionInformation.point);
</span><del>- return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL defaultActions:[_actionSheetAssistant defaultActionsForLinkSheet].get() elementInfo:elementInfo.get()];
</del><ins>+ return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL defaultActions:[_actionSheetAssistant defaultActionsForLinkSheet:elementInfo.get()].get() elementInfo:elementInfo.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)]) {
</span><span class="lines">@@ -3245,7 +3252,7 @@
</span><span class="cx"> [uiDelegate _webView:_webView willPreviewImageWithURL:targetURL];
</span><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</span><span class="cx"> _page->startInteractionWithElementAtPosition(_positionInformation.point);
</span><del>- return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy() defaultActions:[_actionSheetAssistant defaultActionsForImageSheet] elementInfo:elementInfo] autorelease];
</del><ins>+ return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy() defaultActions:[_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()] elementInfo:elementInfo] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm (186718 => 186719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-07-11 22:58:08 UTC (rev 186718)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-07-11 22:58:13 UTC (rev 186719)
</span><span class="lines">@@ -718,6 +718,13 @@
</span><span class="cx"> _webView->_page->navigateToPDFLinkWithSimulatedClick(_positionInformation.url, roundedIntPoint(location), roundedIntPoint(screenPoint));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(APP_LINKS)
+- (BOOL)actionSheetAssistant:(WKActionSheetAssistant *)assistant shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element
+{
+ return _webView->_page->uiClient().shouldIncludeAppLinkActionsForElement(element);
+}
+#endif
+
</ins><span class="cx"> - (RetainPtr<NSArray>)actionSheetAssistant:(WKActionSheetAssistant *)assistant decideActionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions
</span><span class="cx"> {
</span><span class="cx"> return _webView->_page->uiClient().actionsForElement(element, WTF::move(defaultActions));
</span></span></pre>
</div>
</div>
</body>
</html>