<!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>[177348] branches/safari-600.3-branch/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/177348">177348</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 00:44:41 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177298">r177298</a>. <rdar://problem/19198539></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2SharedAPIcWKImmediateActionTypesh">branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKImmediateActionTypes.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2014-12-16 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merged r177298. <rdar://problem/19198539>
+
+ 2014-12-15 Timothy Horton <timothy_horton@apple.com>
+
+ Implement Data Detectors immediate actions for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=139617
+ <rdar://problem/19198539>
+
+ Reviewed by Beth Dakin.
+
+ * Shared/API/c/WKImmediateActionTypes.h:
+ Add a new type.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView mouseDown:]):
+ Send mouseDown along to the WKImmediateActionController too.
+
+ (-[WKView initWithFrame:context:configuration:webView:]):
+ Temporarily disable action menus.
+
+ (-[WKView _dismissContentRelativeChildWindows]):
+ Hide the immediate action preview when detaching child windows.
+
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController willDestroyView:]):
+ Clear the DDActionContext when tearing down the view.
+
+ (-[WKImmediateActionController wkView:willHandleMouseDown:]):
+ (-[WKImmediateActionController _cancelImmediateAction]):
+ (-[WKImmediateActionController _clearImmediateActionState]):
+ (-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ (-[WKImmediateActionController _defaultAnimationController]):
+ (-[WKImmediateActionController _updateImmediateActionItem]):
+ (-[WKImmediateActionController hidePreview]):
+ (-[WKImmediateActionController popoverWillClose:]):
+ (-[WKImmediateActionController _menuItemForDataDetectedText]):
+ Copy most of the DataDetectors implementation into WKImmediateActionController.
+
+ 2014-12-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Delete Notation because we don't use it
+ https://bugs.webkit.org/show_bug.cgi?id=139171
+
+ Reviewed by Kent Tamura.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
+ (WebKit::WKDOMNodeClass):
+ * mac/MigrateHeadersFromWebKitLegacy.make:
+
+2014-12-16 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merged r177242. <rdar://problem/19226350>
</span><span class="cx">
</span><span class="cx"> 2014-12-12 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2SharedAPIcWKImmediateActionTypesh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKImmediateActionTypes.h (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKImmediateActionTypes.h 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKImmediateActionTypes.h 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> enum {
</span><span class="cx"> kWKImmediateActionNone = 0,
</span><span class="cx"> kWKImmediateActionLinkPreview,
</span><ins>+ kWKImmediateActionDataDetectedItem,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t _WKImmediateActionType;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -1244,6 +1244,7 @@
</span><span class="cx"> [self _dismissContentRelativeChildWindows];
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> [_data->_actionMenuController wkView:self willHandleMouseDown:event];
</span><ins>+ [_data->_immediateActionController wkView:self willHandleMouseDown:event];
</ins><span class="cx"> #endif
</span><span class="cx"> [self mouseDownInternal:event];
</span><span class="cx"> }
</span><span class="lines">@@ -3609,13 +3610,14 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_dictionaryLookupPopoverWillClose:) name:getLUNotificationPopoverWillClose() object:nil];
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>- if ([self respondsToSelector:@selector(setActionMenu:)]) {
</del><ins>+ // FIXME: Temporarily disable action menu installation.
+ /*if ([self respondsToSelector:@selector(setActionMenu:)]) {
</ins><span class="cx"> RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
</span><span class="cx"> self.actionMenu = menu.get();
</span><span class="cx"> _data->_actionMenuController = adoptNS([[WKActionMenuController alloc] initWithPage:*_data->_page view:self]);
</span><span class="cx"> self.actionMenu.delegate = _data->_actionMenuController.get();
</span><span class="cx"> self.actionMenu.autoenablesItems = NO;
</span><del>- }
</del><ins>+ }*/
</ins><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="cx"> RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
</span><span class="lines">@@ -4321,6 +4323,10 @@
</span><span class="cx"> if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
</span><span class="cx"> [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 && WK_API_ENABLED
+ [_data->_immediateActionController hidePreview];
+#endif
+
</ins><span class="cx"> [self _setTextIndicator:nullptr fadeOut:NO];
</span><span class="cx">
</span><span class="cx"> static_cast<PageClient&>(*_data->_pageClient).dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> page->send(Messages::WebPage::DataDetectorsDidPresentUI(overlayID));
</span><span class="cx"> } interactionChangedHandler:^() {
</span><span class="cx"> if (_hitTestResult.detectedDataTextIndicator)
</span><del>- _page->setTextIndicator(_hitTestResult.detectedDataTextIndicator->data(), false);
</del><ins>+ page->setTextIndicator(_hitTestResult.detectedDataTextIndicator->data(), false);
</ins><span class="cx"> page->send(Messages::WebPage::DataDetectorsDidChangeUI(overlayID));
</span><span class="cx"> } interactionStoppedHandler:^() {
</span><span class="cx"> page->send(Messages::WebPage::DataDetectorsDidHideUI(overlayID));
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@class DDActionContext;
</ins><span class="cx"> @class WKPagePreviewViewController;
</span><span class="cx"> @class WKView;
</span><span class="cx">
</span><span class="lines">@@ -60,6 +61,9 @@
</span><span class="cx">
</span><span class="cx"> NSPoint _eventLocationInView;
</span><span class="cx">
</span><ins>+ BOOL _hasActivatedActionContext;
+ RetainPtr<DDActionContext> _currentActionContext;
+
</ins><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> RetainPtr<NSPopover> _previewPopover;
</span><span class="cx"> String _previewPopoverOriginalURL;
</span><span class="lines">@@ -71,9 +75,14 @@
</span><span class="cx"> - (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(WKView *)wkView recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer;
</span><span class="cx"> - (void)willDestroyView:(WKView *)view;
</span><span class="cx"> - (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
</span><ins>+- (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event;
</ins><span class="cx">
</span><span class="cx"> - (void)setPreviewTitle:(NSString *)previewTitle;
</span><span class="cx">
</span><ins>+#if WK_API_ENABLED
+- (void)hidePreview;
+#endif // WK_API_ENABLED
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (177347 => 177348)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-16 08:39:05 UTC (rev 177347)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2014-12-16 08:44:41 UTC (rev 177348)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebPageProxyMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><ins>+#import <WebCore/DataDetectorsSPI.h>
</ins><span class="cx"> #import <WebCore/GeometryUtilities.h>
</span><span class="cx"> #import <WebCore/NSMenuSPI.h>
</span><span class="cx"> #import <WebCore/QuickLookMacSPI.h>
</span><span class="lines">@@ -78,14 +79,36 @@
</span><span class="cx"> _wkView = nil;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><span class="cx"> _immediateActionRecognizer = nil;
</span><ins>+ _currentActionContext = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)wkView:(WKView *)wkView willHandleMouseDown:(NSEvent *)event
+{
+ [self _clearImmediateActionState];
+}
+
+- (void)_cancelImmediateAction
+{
+ // Reset the recognizer by turning it off and on again.
+ _immediateActionRecognizer.enabled = NO;
+ _immediateActionRecognizer.enabled = YES;
+
+ [self _clearImmediateActionState];
+}
+
</ins><span class="cx"> - (void)_clearImmediateActionState
</span><span class="cx"> {
</span><ins>+ if (_currentActionContext && _hasActivatedActionContext) {
+ [getDDActionsManagerClass() didUseActions];
+ _hasActivatedActionContext = NO;
+ }
+
</ins><span class="cx"> _state = ImmediateActionState::None;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><span class="cx"> _type = kWKImmediateActionNone;
</span><ins>+ _currentActionContext = nil;
</ins><span class="cx"> _userData = nil;
</span><ins>+ _immediateActionRecognizer.animationController = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData
</span><span class="lines">@@ -105,6 +128,8 @@
</span><span class="cx"> if (immediateActionRecognizer != _immediateActionRecognizer)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ [_wkView _dismissContentRelativeChildWindows];
+
</ins><span class="cx"> _eventLocationInView = [immediateActionRecognizer locationInView:immediateActionRecognizer.view];
</span><span class="cx"> _page->performActionMenuHitTestAtLocation(_eventLocationInView);
</span><span class="cx">
</span><span class="lines">@@ -117,9 +142,10 @@
</span><span class="cx"> if (immediateActionRecognizer != _immediateActionRecognizer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(_state != ImmediateActionState::None);
</del><ins>+ if (_state == ImmediateActionState::None)
+ return;
</ins><span class="cx">
</span><del>- // FIXME: We need to be able to cancel this if the gesture recognizer goes away.
</del><ins>+ // FIXME: We need to be able to cancel this if the gesture recognizer is cancelled.
</ins><span class="cx"> // FIXME: Connection can be null if the process is closed; we should clean up better in that case.
</span><span class="cx"> if (_state == ImmediateActionState::Pending) {
</span><span class="cx"> if (auto* connection = _page->process().connection()) {
</span><span class="lines">@@ -131,6 +157,17 @@
</span><span class="cx">
</span><span class="cx"> if (_state != ImmediateActionState::Ready)
</span><span class="cx"> [self _updateImmediateActionItem];
</span><ins>+
+ if (!_immediateActionRecognizer.animationController) {
+ [self _cancelImmediateAction];
+ return;
+ }
+
+ if (_currentActionContext) {
+ _hasActivatedActionContext = YES;
+ if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
+ [self _cancelImmediateAction];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerDidCancelAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="lines">@@ -162,16 +199,12 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Immediate actions
</span><span class="cx">
</span><del>-- (void)_updateImmediateActionItem
</del><ins>+- (id <NSImmediateActionAnimationController>)_defaultAnimationController
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</span><span class="cx">
</span><del>- _type = kWKImmediateActionNone;
- _immediateActionRecognizer.animationController = nil;
- id <NSImmediateActionAnimationController> defaultAnimationController = nil;
-
</del><span class="cx"> if (!hitTestResult)
</span><del>- return;
</del><ins>+ return nil;
</ins><span class="cx">
</span><span class="cx"> String absoluteLinkURL = hitTestResult->absoluteLinkURL();
</span><span class="cx"> if (!absoluteLinkURL.isEmpty() && WebCore::protocolIsInHTTPFamily(absoluteLinkURL)) {
</span><span class="lines">@@ -186,18 +219,39 @@
</span><span class="cx"> [qlPreviewLinkItem setPreviewStyle:QLPreviewStylePopover];
</span><span class="cx"> [qlPreviewLinkItem setDelegate:self];
</span><span class="cx"> }
</span><del>- defaultAnimationController = (id<NSImmediateActionAnimationController>)qlPreviewLinkItem.get();
- } else {
</del><ins>+ return (id<NSImmediateActionAnimationController>)qlPreviewLinkItem.get();
+ }
+
</ins><span class="cx"> #if WK_API_ENABLED
</span><del>- [self _createPreviewPopoverIfNeededForURL:absoluteLinkURL];
- defaultAnimationController = (id<NSImmediateActionAnimationController>)_previewPopover.get();
</del><ins>+ [self _createPreviewPopoverIfNeededForURL:absoluteLinkURL];
+ return (id<NSImmediateActionAnimationController>)_previewPopover.get();
+#else
+ return nil;
</ins><span class="cx"> #endif // WK_API_ENABLED
</span><ins>+ }
+
+ if (hitTestResult->isTextNode() || hitTestResult->isOverTextInsideFormControlElement()) {
+ if (NSMenuItem *immediateActionItem = [self _menuItemForDataDetectedText]) {
+ _type = kWKImmediateActionDataDetectedItem;
+ return (id<NSImmediateActionAnimationController>)immediateActionItem;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ return nil;
+}
+
+- (void)_updateImmediateActionItem
+{
+ _type = kWKImmediateActionNone;
+
+ id <NSImmediateActionAnimationController> defaultAnimationController = [self _defaultAnimationController];
+
+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())];
</span><del>- if (customClientAnimationController == [NSNull null])
</del><ins>+ if (customClientAnimationController == [NSNull null]) {
+ [self _cancelImmediateAction];
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx"> if (customClientAnimationController && [customClientAnimationController conformsToProtocol:@protocol(NSImmediateActionAnimationController)])
</span><span class="cx"> _immediateActionRecognizer.animationController = (id <NSImmediateActionAnimationController>)customClientAnimationController;
</span><span class="cx"> else
</span><span class="lines">@@ -236,7 +290,7 @@
</span><span class="cx"> [_previewPopover setDelegate:self];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_clearPreviewPopover
</del><ins>+- (void)hidePreview
</ins><span class="cx"> {
</span><span class="cx"> if (_previewViewController) {
</span><span class="cx"> _previewViewController->_delegate = nil;
</span><span class="lines">@@ -257,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)popoverWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- [self _clearPreviewPopover];
</del><ins>+ [self hidePreview];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool targetSizeFitsInAvailableSpace(NSSize targetSize, NSSize availableSpace)
</span><span class="lines">@@ -391,6 +445,45 @@
</span><span class="cx"> return NSMaxYEdge;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark Data Detectors actions
+
+- (NSMenuItem *)_menuItemForDataDetectedText
+{
+ DDActionContext *actionContext = _hitTestResult.actionContext.get();
+ if (!actionContext)
+ return nil;
+
+ actionContext.altMode = YES;
+ if ([[getDDActionsManagerClass() sharedManager] respondsToSelector:@selector(hasActionsForResult:actionContext:)]) {
+ if (![[getDDActionsManagerClass() sharedManager] hasActionsForResult:actionContext.mainResult actionContext:actionContext])
+ return nil;
+ }
+
+ RefPtr<WebPageProxy> page = _page;
+ PageOverlay::PageOverlayID overlayID = _hitTestResult.detectedDataOriginatingPageOverlay;
+ _currentActionContext = [actionContext contextForView:_wkView altMode:YES interactionStartedHandler:^() {
+ page->send(Messages::WebPage::DataDetectorsDidPresentUI(overlayID));
+ } interactionChangedHandler:^() {
+ if (_hitTestResult.detectedDataTextIndicator)
+ page->setTextIndicator(_hitTestResult.detectedDataTextIndicator->data(), false);
+ page->send(Messages::WebPage::DataDetectorsDidChangeUI(overlayID));
+ } interactionStoppedHandler:^() {
+ page->send(Messages::WebPage::DataDetectorsDidHideUI(overlayID));
+ page->clearTextIndicator();
+ }];
+
+ [_currentActionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]]];
+
+ NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
+
+ if (menuItems.count != 1)
+ return nil;
+
+ if (_hitTestResult.detectedDataTextIndicator)
+ _hitTestResult.detectedDataTextIndicator->setPresentationTransition(TextIndicatorPresentationTransition::Bounce);
+ return menuItems.lastObject;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>