<!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>[197866] 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/197866">197866</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-03-09 11:29:29 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add two finger tap on links.
https://bugs.webkit.org/show_bug.cgi?id=155205
rdar://problem/22937516
Reviewed by Sam Weinig.
Adds two finger tap gesture recognizer. When performed
on a link, it calls the delegate.
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView _removeDefaultGestureRecognizers]):
(-[WKContentView _addDefaultGestureRecognizers]):
(-[WKContentView _twoFingerSingleTapGestureRecognized:]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::handleTwoFingerTapAtPoint):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleTwoFingerTapAtPoint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</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 (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-03-09 Enrica Casucci <enrica@apple.com>
+
+ Add two finger tap on links.
+ https://bugs.webkit.org/show_bug.cgi?id=155205
+ rdar://problem/22937516
+
+ Reviewed by Sam Weinig.
+
+ Adds two finger tap gesture recognizer. When performed
+ on a link, it calls the delegate.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView _removeDefaultGestureRecognizers]):
+ (-[WKContentView _addDefaultGestureRecognizers]):
+ (-[WKContentView _twoFingerSingleTapGestureRecognized:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::handleTwoFingerTapAtPoint):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::handleTwoFingerTapAtPoint):
+
</ins><span class="cx"> 2016-03-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Always call NSURLSession completion handlers
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -316,6 +316,8 @@
</span><span class="cx">
</span><span class="cx"> @interface UITapGestureRecognizer ()
</span><span class="cx"> @property (nonatomic, readonly) CGPoint location;
</span><ins>+@property (nonatomic) CGFloat allowableMovement;
+@property (nonatomic, readonly) CGPoint centroid;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @class WebEvent;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController committing:(BOOL)committing WK_AVAILABLE(NA, 9_0);
</span><span class="cx"> - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController WK_AVAILABLE(NA, 9_0);
</span><span class="cx"> - (BOOL)_webView:(WKWebView *)webView showCustomSheetForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
</span><ins>+- (void)_webView:(WKWebView *)webView alternateActionForURL:(NSURL *)url WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx"> - (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
</span><span class="cx"> - (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
</span><span class="cx"> - (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_AVAILABLE(NA, 9_0);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -519,6 +519,7 @@
</span><span class="cx"> void didFinishDrawingPagesToPDF(const IPC::DataReference&);
</span><span class="cx"> void contentSizeCategoryDidChange(const String& contentSizeCategory);
</span><span class="cx"> void getLookupContextAtPoint(const WebCore::IntPoint&, std::function<void(const String&, CallbackBase::Error)>);
</span><ins>+ void handleTwoFingerTapAtPoint(const WebCore::IntPoint&, std::function<void(const String&, CallbackBase::Error)>);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx"> void setDataDetectionResult(const DataDetectionResult&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> RetainPtr<UITapGestureRecognizer> _doubleTapGestureRecognizer;
</span><span class="cx"> RetainPtr<UITapGestureRecognizer> _nonBlockingDoubleTapGestureRecognizer;
</span><span class="cx"> RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
</span><ins>+ RetainPtr<UITapGestureRecognizer> _twoFingerSingleTapGestureRecognizer;
</ins><span class="cx"> RetainPtr<WKInspectorNodeSearchGestureRecognizer> _inspectorNodeSearchGestureRecognizer;
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -486,6 +486,14 @@
</span><span class="cx"> [_longPressGestureRecognizer _setRequiresQuietImpulse:YES];
</span><span class="cx"> [self addGestureRecognizer:_longPressGestureRecognizer.get()];
</span><span class="cx">
</span><ins>+ _twoFingerSingleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerSingleTapGestureRecognized:)]);
+ [_twoFingerSingleTapGestureRecognizer setAllowableMovement:60];
+ [_twoFingerSingleTapGestureRecognizer setNumberOfTapsRequired:1];
+ [_twoFingerSingleTapGestureRecognizer setNumberOfTouchesRequired:2];
+ [_twoFingerSingleTapGestureRecognizer setDelaysTouchesEnded:NO];
+ [_twoFingerSingleTapGestureRecognizer setDelegate:self];
+ [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
+
</ins><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx"> [self _registerPreview];
</span><span class="cx"> #endif
</span><span class="lines">@@ -546,6 +554,9 @@
</span><span class="cx"> [_twoFingerDoubleTapGestureRecognizer setDelegate:nil];
</span><span class="cx"> [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><span class="cx">
</span><ins>+ [_twoFingerSingleTapGestureRecognizer setDelegate:nil];
+ [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
+
</ins><span class="cx"> _inspectorNodeSearchEnabled = NO;
</span><span class="cx"> if (_inspectorNodeSearchGestureRecognizer) {
</span><span class="cx"> [_inspectorNodeSearchGestureRecognizer setDelegate:nil];
</span><span class="lines">@@ -572,6 +583,7 @@
</span><span class="cx"> [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
</span><span class="cx"> [self removeGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
</span><span class="cx"> [self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><ins>+ [self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_addDefaultGestureRecognizers
</span><span class="lines">@@ -582,6 +594,7 @@
</span><span class="cx"> [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
</span><span class="cx"> [self addGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
</span><span class="cx"> [self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
</span><ins>+ [self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (UIView*)unscaledView
</span><span class="lines">@@ -1293,6 +1306,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_twoFingerSingleTapGestureRecognized:(UITapGestureRecognizer *)gestureRecognizer
+{
+ _page->tapHighlightAtPosition(gestureRecognizer.centroid, ++_latestTapID);
+ _isTapHighlightIDValid = YES;
+ RetainPtr<WKContentView> view = self;
+ WKWebView *webView = _webView;
+ _page->handleTwoFingerTapAtPoint(roundedIntPoint(gestureRecognizer.centroid), [view, webView](const String& string, CallbackBase::Error error) {
+ if (error != CallbackBase::Error::None)
+ return;
+ if (!string.isEmpty()) {
+ id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([webView UIDelegate]);
+ if ([uiDelegate respondsToSelector:@selector(_webView:alternateActionForURL:)])
+ [uiDelegate _webView:webView alternateActionForURL:[NSURL _web_URLWithWTFString:string]];
+ [view _finishInteraction];
+ } else
+ [view _cancelInteraction];
+ });
+}
+
</ins><span class="cx"> - (void)_longPressRecognized:(UILongPressGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><span class="cx"> ASSERT(gestureRecognizer == _longPressGestureRecognizer);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -556,6 +556,17 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetLookupContextAtPoint(point, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::handleTwoFingerTapAtPoint(const WebCore::IntPoint& point, std::function<void(const String&, CallbackBase::Error)> callbackFunction)
+{
+ if (!isValid()) {
+ callbackFunction(String(), CallbackBase::Error::Unknown);
+ return;
+ }
+
+ uint64_t callbackID = m_callbacks.put(WTFMove(callbackFunction), m_process->throttler().backgroundActivityToken());
+ process().send(Messages::WebPage::HandleTwoFingerTapAtPoint(point, callbackID), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> WebCore::IntRect rectForElementAtInteractionLocation();
</span><span class="cx"> void updateSelectionAppearance();
</span><span class="cx"> void getLookupContextAtPoint(const WebCore::IntPoint, uint64_t callbackID);
</span><del>-
</del><ins>+ void handleTwoFingerTapAtPoint(const WebCore::IntPoint&, uint64_t callbackID);
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> void dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> ExecuteEditCommandWithCallback(String name, uint64_t callbackID)
</span><span class="cx"> GetLookupContextAtPoint(WebCore::IntPoint point, uint64_t callbackID)
</span><span class="cx"> SetAllowsMediaDocumentInlinePlayback(bool allows)
</span><ins>+ HandleTwoFingerTapAtPoint(WebCore::IntPoint point, uint64_t callbackID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SetControlledByAutomation(bool controlled)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (197865 => 197866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-09 19:04:07 UTC (rev 197865)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-09 19:29:29 UTC (rev 197866)
</span><span class="lines">@@ -630,6 +630,17 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::handleTwoFingerTapAtPoint(const WebCore::IntPoint& point, uint64_t callbackID)
+{
+ FloatPoint adjustedPoint;
+ Node* nodeRespondingToClick = m_page->mainFrame().nodeRespondingToClickEvents(point, adjustedPoint);
+ Element* element = (nodeRespondingToClick && is<Element>(*nodeRespondingToClick)) ? downcast<Element>(nodeRespondingToClick) : nullptr;
+ String url;
+ if (element && element->isLink())
+ url = [(NSURL *)element->document().completeURL(stripLeadingAndTrailingHTMLSpaces(element->getAttribute(HTMLNames::hrefAttr))) absoluteString];
+ send(Messages::WebPageProxy::StringCallback(url, callbackID));
+}
+
</ins><span class="cx"> void WebPage::potentialTapAtPosition(uint64_t requestID, const WebCore::FloatPoint& position)
</span><span class="cx"> {
</span><span class="cx"> m_potentialTapNode = m_page->mainFrame().nodeRespondingToClickEvents(position, m_potentialTapLocation);
</span></span></pre>
</div>
</div>
</body>
</html>