<!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>[198446] 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/198446">198446</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 15:35:33 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add id attribute to _WKActivatedElementInfo.
https://bugs.webkit.org/show_bug.cgi?id=155666
rdar://problem/25181956
Reviewed by Beth Dakin.
* Shared/ios/InteractionInformationAtPosition.h:
* Shared/ios/InteractionInformationAtPosition.mm:
(WebKit::InteractionInformationAtPosition::encode):
(WebKit::InteractionInformationAtPosition::decode):
* UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
* UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:
(-[_WKActivatedElementInfo _initWithType:URL:location:title:ID:rect:image:]):
(-[_WKActivatedElementInfo ID]):
(-[_WKActivatedElementInfo _initWithType:URL:location:title:rect:image:]): Deleted.
* UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant showImageSheet]):
(-[WKActionSheetAssistant showLinkSheet]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showAttachmentSheet]):
(-[WKContentView _showLinkSheet]):
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
(-[WKContentView _presentedViewControllerForPreviewItemController:]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharediosInteractionInformationAtPositionh">trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosInteractionInformationAtPositionmm">trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfomm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.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="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-18 Enrica Casucci <enrica@apple.com>
+
+ Add id attribute to _WKActivatedElementInfo.
+ https://bugs.webkit.org/show_bug.cgi?id=155666
+ rdar://problem/25181956
+
+ Reviewed by Beth Dakin.
+
+ * Shared/ios/InteractionInformationAtPosition.h:
+ * Shared/ios/InteractionInformationAtPosition.mm:
+ (WebKit::InteractionInformationAtPosition::encode):
+ (WebKit::InteractionInformationAtPosition::decode):
+ * UIProcess/API/Cocoa/_WKActivatedElementInfo.h:
+ * UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:
+ (-[_WKActivatedElementInfo _initWithType:URL:location:title:ID:rect:image:]):
+ (-[_WKActivatedElementInfo ID]):
+ (-[_WKActivatedElementInfo _initWithType:URL:location:title:rect:image:]): Deleted.
+ * UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h:
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant showImageSheet]):
+ (-[WKActionSheetAssistant showLinkSheet]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _showAttachmentSheet]):
+ (-[WKContentView _showLinkSheet]):
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ (-[WKContentView _presentedViewControllerForPreviewItemController:]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2016-03-18 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Protect against excessive cache traversal
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosInteractionInformationAtPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> String url;
</span><span class="cx"> String imageURL;
</span><span class="cx"> String title;
</span><ins>+ String idAttribute;
</ins><span class="cx"> WebCore::IntRect bounds;
</span><span class="cx"> RefPtr<ShareableBitmap> image;
</span><span class="cx"> String textBefore;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosInteractionInformationAtPositionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/Shared/ios/InteractionInformationAtPosition.mm 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> encoder << url;
</span><span class="cx"> encoder << imageURL;
</span><span class="cx"> encoder << title;
</span><ins>+ encoder << idAttribute;
</ins><span class="cx"> encoder << bounds;
</span><span class="cx"> encoder << textBefore;
</span><span class="cx"> encoder << textAfter;
</span><span class="lines">@@ -119,6 +120,9 @@
</span><span class="cx"> if (!decoder.decode(result.title))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.idAttribute))
+ return false;
+
</ins><span class="cx"> if (!decoder.decode(result.bounds))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> @property (nonatomic, readonly) NSString *title;
</span><span class="cx"> @property (nonatomic, readonly) _WKActivatedElementType type;
</span><span class="cx"> @property (nonatomic, readonly) CGRect boundingRect;
</span><ins>+@property (nonatomic, readonly) NSString *ID WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, readonly, copy) UIImage *image;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfomm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> RetainPtr<NSURL> _URL;
</span><span class="cx"> RetainPtr<NSString> _title;
</span><span class="cx"> CGPoint _interactionLocation;
</span><ins>+ RetainPtr<NSString> _ID;
</ins><span class="cx"> RefPtr<WebKit::ShareableBitmap> _image;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<UIImage> _uiImage;
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image
</del><ins>+- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image
</ins><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> _boundingRect = rect;
</span><span class="cx"> _type = type;
</span><span class="cx"> _image = image;
</span><ins>+ _ID = ID;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -77,6 +79,11 @@
</span><span class="cx"> return _title.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)ID
+{
+ return _ID.get();
+}
+
</ins><span class="cx"> - (CGPoint)_interactionLocation
</span><span class="cx"> {
</span><span class="cx"> return _interactionLocation;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> @interface _WKActivatedElementInfo ()
</span><span class="cx">
</span><del>-- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image;
</del><ins>+- (instancetype)_initWithType:(_WKActivatedElementType)type URL:(NSURL *)url location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) CGPoint _interactionLocation;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -280,7 +280,7 @@
</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 elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds image:positionInformation.image.get()]);
</del><ins>+ auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:positionInformation.point title:positionInformation.title ID:positionInformation.idAttribute rect:positionInformation.bounds image:positionInformation.image.get()]);
</ins><span class="cx"> if ([delegate respondsToSelector:@selector(actionSheetAssistant:showCustomSheetForElement:)] && [delegate actionSheetAssistant:self showCustomSheetForElement:elementInfo.get()])
</span><span class="cx"> return;
</span><span class="cx"> auto defaultActions = [self defaultActionsForImageSheet:elementInfo.get()];
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> if (!targetURL)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto 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 ID:positionInformation.idAttribute rect:positionInformation.bounds image:positionInformation.image.get()]);
</ins><span class="cx"> if ([delegate respondsToSelector:@selector(actionSheetAssistant:showCustomSheetForElement:)] && [delegate actionSheetAssistant:self showCustomSheetForElement:elementInfo.get()])
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -1123,7 +1123,7 @@
</span><span class="cx"> id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</span><span class="cx">
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:showCustomSheetForElement:)])
</span><del>- [uiDelegate _webView:_webView showCustomSheetForElement:[[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:[NSURL _web_URLWithWTFString:_positionInformation.url] location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:nil]];
</del><ins>+ [uiDelegate _webView:_webView showCustomSheetForElement:[[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:[NSURL _web_URLWithWTFString:_positionInformation.url] location:_positionInformation.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:nil]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_showLinkSheet
</span><span class="lines">@@ -3885,7 +3885,7 @@
</span><span class="cx"> // FIXME: Should use UIKit constants.
</span><span class="cx"> enum { WKUIPreviewItemTypeAttachment = 5 };
</span><span class="cx"> *type = static_cast<UIPreviewItemType>(WKUIPreviewItemTypeAttachment);
</span><del>- const auto& element = [[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:[NSURL _web_URLWithWTFString:_positionInformation.url] location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:nil];
</del><ins>+ const auto& element = [[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:[NSURL _web_URLWithWTFString:_positionInformation.url] location:_positionInformation.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:nil];
</ins><span class="cx"> dataForPreview[@"UIPreviewDataAttachmentList"] = [uiDelegate _attachmentListForWebView:_webView];
</span><span class="cx"> dataForPreview[@"UIPreviewDataAttachmentIndex"] = [NSNumber numberWithUnsignedInteger:[uiDelegate _webView:_webView indexIntoAttachmentListForElement:element]];
</span><span class="cx"> }
</span><span class="lines">@@ -3932,7 +3932,7 @@
</span><span class="cx">
</span><span class="cx"> // Treat animated images like a link preview
</span><span class="cx"> if (isValidURLForImagePreview && _positionInformation.isAnimatedImage) {
</span><del>- RetainPtr<_WKActivatedElementInfo> animatedImageElementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</del><ins>+ RetainPtr<_WKActivatedElementInfo> animatedImageElementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</ins><span class="cx">
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForAnimatedImageAtURL:defaultActions:elementInfo:imageSize:)]) {
</span><span class="cx"> RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:animatedImageElementInfo.get()];
</span><span class="lines">@@ -3940,7 +3940,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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>+ RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink URL:targetURL location:_positionInformation.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</ins><span class="cx">
</span><span class="cx"> auto actions = [_actionSheetAssistant defaultActionsForLinkSheet:elementInfo.get()];
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(webView:previewingViewControllerForElement:defaultActions:)]) {
</span><span class="lines">@@ -3968,7 +3968,7 @@
</span><span class="cx"> if (!isValidURLForImagePreview)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</del><ins>+ RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage URL:targetURL location:_positionInformation.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:_positionInformation.image.get()]);
</ins><span class="cx"> _page->startInteractionWithElementAtPosition(_positionInformation.point);
</span><span class="cx">
</span><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (198445 => 198446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-18 22:35:26 UTC (rev 198445)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-18 22:35:33 UTC (rev 198446)
</span><span class="lines">@@ -2193,6 +2193,7 @@
</span><span class="cx"> Element* element = is<Element>(*hitNode) ? downcast<Element>(hitNode) : nullptr;
</span><span class="cx"> if (element) {
</span><span class="cx"> info.isElement = true;
</span><ins>+ info.idAttribute = element->getIdAttribute();
</ins><span class="cx"> Element* linkElement = nullptr;
</span><span class="cx"> if (element->renderer() && element->renderer()->isRenderImage()) {
</span><span class="cx"> elementIsLinkOrImage = true;
</span></span></pre>
</div>
</div>
</body>
</html>