<!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>[175577] 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/175577">175577</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 13:44:11 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Include a WKActionSheetAssistant parameter in WKActionSheetAssistantDelegate methods
https://bugs.webkit.org/show_bug.cgi?id=137792
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/_WKElementAction.mm:
(+[_WKElementAction elementActionWithTitle:actionHandler:]):
(+[_WKElementAction elementActionWithType:customTitle:]):
(-[_WKElementAction _runActionWithElementInfo:forActionSheetAssistant:]):
* UIProcess/API/Cocoa/_WKElementActionInternal.h:
* UIProcess/ios/WKActionSheetAssistant.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]):
(-[WKActionSheetAssistant presentationRectInHostViewForSheet]):
(-[WKActionSheetAssistant updatePositionInformation]):
(-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
(-[WKActionSheetAssistant showImageSheet]):
(-[WKActionSheetAssistant showLinkSheet]):
(-[WKActionSheetAssistant showDataDetectorsSheet]):
(-[WKActionSheetAssistant cleanupSheet]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView positionInformationForActionSheetAssistant:]):
(-[WKContentView updatePositionInformationForActionSheetAssistant:]):
(-[WKContentView actionSheetAssistant:performAction:]):
(-[WKContentView actionSheetAssistant:openElementAtLocation:]):
(-[WKContentView actionSheetAssistant:decideActionsForElement:defaultActions:]):
(-[WKContentView actionSheetAssistant:willStartInteractionWithElement:]):
(-[WKContentView actionSheetAssistantDidStopInteraction:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKElementActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKElementActionInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-11-04 Andy Estes <aestes@apple.com>
+
+ [iOS] Include a WKActionSheetAssistant parameter in WKActionSheetAssistantDelegate methods
+ https://bugs.webkit.org/show_bug.cgi?id=137792
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/_WKElementAction.mm:
+ (+[_WKElementAction elementActionWithTitle:actionHandler:]):
+ (+[_WKElementAction elementActionWithType:customTitle:]):
+ (-[_WKElementAction _runActionWithElementInfo:forActionSheetAssistant:]):
+ * UIProcess/API/Cocoa/_WKElementActionInternal.h:
+ * UIProcess/ios/WKActionSheetAssistant.h:
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant initialPresentationRectInHostViewForSheet]):
+ (-[WKActionSheetAssistant presentationRectInHostViewForSheet]):
+ (-[WKActionSheetAssistant updatePositionInformation]):
+ (-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
+ (-[WKActionSheetAssistant showImageSheet]):
+ (-[WKActionSheetAssistant showLinkSheet]):
+ (-[WKActionSheetAssistant showDataDetectorsSheet]):
+ (-[WKActionSheetAssistant cleanupSheet]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView positionInformationForActionSheetAssistant:]):
+ (-[WKContentView updatePositionInformationForActionSheetAssistant:]):
+ (-[WKContentView actionSheetAssistant:performAction:]):
+ (-[WKContentView actionSheetAssistant:openElementAtLocation:]):
+ (-[WKContentView actionSheetAssistant:decideActionsForElement:defaultActions:]):
+ (-[WKContentView actionSheetAssistant:willStartInteractionWithElement:]):
+ (-[WKContentView actionSheetAssistantDidStopInteraction:]):
+
</ins><span class="cx"> 2014-11-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> URTBF after r175564 for !PLATFORM(COCOA).
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKElementActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK(SafariServices);
</span><span class="cx"> SOFT_LINK_CLASS(SafariServices, SSReadingList);
</span><span class="cx">
</span><del>-typedef void (^WKElementActionHandlerInternal)(id <WKActionSheetAssistantDelegate>, _WKActivatedElementInfo *);
</del><ins>+typedef void (^WKElementActionHandlerInternal)(WKActionSheetAssistant *, _WKActivatedElementInfo *);
</ins><span class="cx">
</span><span class="cx"> @implementation _WKElementAction {
</span><span class="cx"> RetainPtr<NSString> _title;
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> + (instancetype)elementActionWithTitle:(NSString *)title actionHandler:(WKElementActionHandler)handler
</span><span class="cx"> {
</span><del>- return [[[self alloc] _initWithTitle:title actionHandler:^(id <WKActionSheetAssistantDelegate>, _WKActivatedElementInfo *actionInfo) { handler(actionInfo); }
</del><ins>+ return [[[self alloc] _initWithTitle:title actionHandler:^(WKActionSheetAssistant *, _WKActivatedElementInfo *actionInfo) { handler(actionInfo); }
</ins><span class="cx"> type:_WKElementActionTypeCustom] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,25 +91,25 @@
</span><span class="cx"> switch (type) {
</span><span class="cx"> case _WKElementActionTypeCopy:
</span><span class="cx"> title = WEB_UI_STRING_KEY("Copy", "Copy ActionSheet Link", "Title for Copy Link or Image action button");
</span><del>- handler = ^(id <WKActionSheetAssistantDelegate> delegate, _WKActivatedElementInfo *actionInfo) {
- [delegate performAction:WebKit::SheetAction::Copy];
</del><ins>+ handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) {
+ [assistant.delegate actionSheetAssistant:assistant performAction:WebKit::SheetAction::Copy];
</ins><span class="cx"> };
</span><span class="cx"> break;
</span><span class="cx"> case _WKElementActionTypeOpen:
</span><span class="cx"> title = WEB_UI_STRING_KEY("Open", "Open ActionSheet Link", "Title for Open Link action button");
</span><del>- handler = ^(id <WKActionSheetAssistantDelegate> delegate, _WKActivatedElementInfo *actionInfo) {
- [delegate openElementAtLocation:actionInfo._interactionLocation];
</del><ins>+ handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) {
+ [assistant.delegate actionSheetAssistant:assistant openElementAtLocation:actionInfo._interactionLocation];
</ins><span class="cx"> };
</span><span class="cx"> break;
</span><span class="cx"> case _WKElementActionTypeSaveImage:
</span><span class="cx"> title = WEB_UI_STRING_KEY("Save Image", "Save Image", "Title for Save Image action button");
</span><del>- handler = ^(id <WKActionSheetAssistantDelegate> delegate, _WKActivatedElementInfo *actionInfo) {
- [delegate performAction:WebKit::SheetAction::SaveImage];
</del><ins>+ handler = ^(WKActionSheetAssistant *assistant, _WKActivatedElementInfo *actionInfo) {
+ [assistant.delegate actionSheetAssistant:assistant performAction:WebKit::SheetAction::SaveImage];
</ins><span class="cx"> };
</span><span class="cx"> break;
</span><span class="cx"> case _WKElementActionTypeAddToReadingList:
</span><span class="cx"> title = WEB_UI_STRING("Add to Reading List", "Title for Add to Reading List action button");
</span><del>- handler = ^(id <WKActionSheetAssistantDelegate>, _WKActivatedElementInfo *actionInfo) {
</del><ins>+ handler = ^(WKActionSheetAssistant *, _WKActivatedElementInfo *actionInfo) {
</ins><span class="cx"> addToReadingList(actionInfo.URL, actionInfo.title);
</span><span class="cx"> };
</span><span class="cx"> break;
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> return _title.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_runActionWithElementInfo:(_WKActivatedElementInfo *)info delegate:(id <WKActionSheetAssistantDelegate>)delegate
</del><ins>+- (void)_runActionWithElementInfo:(_WKActivatedElementInfo *)info forActionSheetAssistant:(WKActionSheetAssistant *)assistant
</ins><span class="cx"> {
</span><del>- _actionHandler(delegate, info);
</del><ins>+ _actionHandler(assistant, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKElementActionInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementActionInternal.h 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+@class WKActionSheetAssistant;
</ins><span class="cx"> @class WKContentView;
</span><del>-@protocol WKActionSheetAssistantDelegate;
</del><span class="cx">
</span><span class="cx"> @interface _WKElementAction ()
</span><span class="cx">
</span><del>-- (void)_runActionWithElementInfo:(_WKActivatedElementInfo *)info delegate:(id <WKActionSheetAssistantDelegate>)delegate;
</del><ins>+- (void)_runActionWithElementInfo:(_WKActivatedElementInfo *)info forActionSheetAssistant:(WKActionSheetAssistant *)assistant;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistanth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -36,18 +36,19 @@
</span><span class="cx"> struct InteractionInformationAtPosition;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@class WKActionSheetAssistant;
+@class _WKActivatedElementInfo;
</ins><span class="cx"> @protocol WKActionSheetDelegate;
</span><del>-@class _WKActivatedElementInfo;
</del><span class="cx">
</span><span class="cx"> @protocol WKActionSheetAssistantDelegate
</span><span class="cx"> @required
</span><del>-@property (nonatomic, readonly) const WebKit::InteractionInformationAtPosition& positionInformation;
-- (void)updatePositionInformation;
-- (void)performAction:(WebKit::SheetAction)action;
-- (void)openElementAtLocation:(CGPoint)location;
-- (RetainPtr<NSArray>)actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions;
-- (void)startInteractionWithElement:(_WKActivatedElementInfo *)element;
-- (void)stopInteraction;
</del><ins>+- (const WebKit::InteractionInformationAtPosition&)positionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant;
+- (void)updatePositionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant;
+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant performAction:(WebKit::SheetAction)action;
+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant openElementAtLocation:(CGPoint)location;
+- (RetainPtr<NSArray>)actionSheetAssistant:(WKActionSheetAssistant *)assistant decideActionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions;
+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant willStartInteractionWithElement:(_WKActivatedElementInfo *)element;
+- (void)actionSheetAssistantDidStopInteraction:(WKActionSheetAssistant *)assistant;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKActionSheetAssistant : NSObject <WKActionSheetDelegate, DDDetectionControllerInteractionDelegate>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -137,8 +137,7 @@
</span><span class="cx"> if (!view || !delegate)
</span><span class="cx"> return CGRectZero;
</span><span class="cx">
</span><del>- return [self _presentationRectForSheetGivenPoint:[delegate positionInformation].point inHostView:view];
-
</del><ins>+ return [self _presentationRectForSheetGivenPoint:[delegate positionInformationForActionSheetAssistant:self].point inHostView:view];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGRect)presentationRectInHostViewForSheet
</span><span class="lines">@@ -148,7 +147,7 @@
</span><span class="cx"> if (!view || !delegate)
</span><span class="cx"> return CGRectZero;
</span><span class="cx">
</span><del>- const auto& positionInformation = [delegate positionInformation];
</del><ins>+ const auto& positionInformation = [delegate positionInformationForActionSheetAssistant:self];
</ins><span class="cx">
</span><span class="cx"> CGRect boundingRect = positionInformation.bounds;
</span><span class="cx"> CGPoint fromPoint = positionInformation.point;
</span><span class="lines">@@ -164,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)updatePositionInformation
</span><span class="cx"> {
</span><del>- [_delegate.get() updatePositionInformation];
</del><ins>+ [_delegate.get() updatePositionInformationForActionSheetAssistant:self];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)presentSheet
</span><span class="lines">@@ -192,7 +191,7 @@
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto& positionInformation = [delegate positionInformation];
</del><ins>+ const auto& positionInformation = [delegate positionInformationForActionSheetAssistant:self];
</ins><span class="cx">
</span><span class="cx"> NSURL *targetURL = [NSURL URLWithString:positionInformation.url];
</span><span class="cx"> NSString *urlScheme = [targetURL scheme];
</span><span class="lines">@@ -225,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> for (_WKElementAction *action in actions) {
</span><span class="cx"> [_interactionSheet _addActionWithTitle:[action title] style:UIAlertActionStyleDefault handler:^{
</span><del>- [action _runActionWithElementInfo:_elementInfo.get() delegate:delegate.get()];
</del><ins>+ [action _runActionWithElementInfo:_elementInfo.get() forActionSheetAssistant:self];
</ins><span class="cx"> [self cleanupSheet];
</span><span class="cx"> } shouldDismissHandler:^{
</span><span class="cx"> return (BOOL)(!action.dismissalHandler || action.dismissalHandler());
</span><span class="lines">@@ -237,7 +236,7 @@
</span><span class="cx"> handler:^(UIAlertAction *action) {
</span><span class="cx"> [self cleanupSheet];
</span><span class="cx"> }]];
</span><del>- [delegate startInteractionWithElement:_elementInfo.get()];
</del><ins>+ [delegate actionSheetAssistant:self willStartInteractionWithElement:_elementInfo.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)showImageSheet
</span><span class="lines">@@ -249,7 +248,7 @@
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto& positionInformation = [delegate positionInformation];
</del><ins>+ const auto& positionInformation = [delegate positionInformationForActionSheetAssistant:self];
</ins><span class="cx">
</span><span class="cx"> NSURL *targetURL = [NSURL URLWithString:positionInformation.url];
</span><span class="cx"> auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
</span><span class="lines">@@ -265,7 +264,7 @@
</span><span class="cx"> auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage
</span><span class="cx"> URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
</span><span class="cx">
</span><del>- RetainPtr<NSArray> actions = [delegate actionsForElement:elementInfo.get() defaultActions:WTF::move(defaultActions)];
</del><ins>+ RetainPtr<NSArray> actions = [delegate actionSheetAssistant:self decideActionsForElement:elementInfo.get() defaultActions:WTF::move(defaultActions)];
</ins><span class="cx">
</span><span class="cx"> if (![actions count])
</span><span class="cx"> return;
</span><span class="lines">@@ -289,7 +288,7 @@
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto& positionInformation = [delegate positionInformation];
</del><ins>+ const auto& positionInformation = [delegate positionInformationForActionSheetAssistant:self];
</ins><span class="cx">
</span><span class="cx"> NSURL *targetURL = [NSURL URLWithString:positionInformation.url];
</span><span class="cx"> if (!targetURL)
</span><span class="lines">@@ -305,7 +304,7 @@
</span><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink
</span><span class="cx"> URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
</span><span class="cx">
</span><del>- RetainPtr<NSArray> actions = [delegate actionsForElement:elementInfo.get() defaultActions:WTF::move(defaultActions)];
</del><ins>+ RetainPtr<NSArray> actions = [delegate actionSheetAssistant:self decideActionsForElement:elementInfo.get() defaultActions:WTF::move(defaultActions)];
</ins><span class="cx">
</span><span class="cx"> if (![actions count])
</span><span class="cx"> return;
</span><span class="lines">@@ -328,7 +327,7 @@
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSURL *targetURL = [NSURL URLWithString:[delegate positionInformation].url];
</del><ins>+ NSURL *targetURL = [NSURL URLWithString:[delegate positionInformationForActionSheetAssistant:self].url];
</ins><span class="cx"> if (!targetURL)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -366,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)cleanupSheet
</span><span class="cx"> {
</span><del>- [_delegate.get() stopInteraction];
</del><ins>+ [_delegate.get() actionSheetAssistantDidStopInteraction:self];
</ins><span class="cx">
</span><span class="cx"> [_interactionSheet doneWithSheet];
</span><span class="cx"> [_interactionSheet setSheetDelegate:nil];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (175576 => 175577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-11-04 21:02:27 UTC (rev 175576)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-11-04 21:44:11 UTC (rev 175577)
</span><span class="lines">@@ -2688,33 +2688,38 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark - Implementation of WKActionSheetAssistantDelegate.
</span><span class="cx">
</span><del>-- (void)updatePositionInformation
</del><ins>+- (const WebKit::InteractionInformationAtPosition&)positionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant
</ins><span class="cx"> {
</span><ins>+ return _positionInformation;
+}
+
+- (void)updatePositionInformationForActionSheetAssistant:(WKActionSheetAssistant *)assistant
+{
</ins><span class="cx"> _hasValidPositionInformation = NO;
</span><span class="cx"> _page->requestPositionInformation(_positionInformation.point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)performAction:(WebKit::SheetAction)action
</del><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant performAction:(WebKit::SheetAction)action
</ins><span class="cx"> {
</span><span class="cx"> _page->performActionOnElement((uint32_t)action);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)openElementAtLocation:(CGPoint)location
</del><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant openElementAtLocation:(CGPoint)location
</ins><span class="cx"> {
</span><span class="cx"> [self _attemptClickAtLocation:location];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RetainPtr<NSArray>)actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions
</del><ins>+- (RetainPtr<NSArray>)actionSheetAssistant:(WKActionSheetAssistant *)assistant decideActionsForElement:(_WKActivatedElementInfo *)element defaultActions:(RetainPtr<NSArray>)defaultActions
</ins><span class="cx"> {
</span><span class="cx"> return _page->uiClient().actionsForElement(element, WTF::move(defaultActions));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)startInteractionWithElement:(_WKActivatedElementInfo *)element
</del><ins>+- (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant willStartInteractionWithElement:(_WKActivatedElementInfo *)element
</ins><span class="cx"> {
</span><span class="cx"> _page->startInteractionWithElementAtPosition(_positionInformation.point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)stopInteraction
</del><ins>+- (void)actionSheetAssistantDidStopInteraction:(WKActionSheetAssistant *)assistant
</ins><span class="cx"> {
</span><span class="cx"> _page->stopInteraction();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>