<!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>[176060] branches/safari-600.3-branch/Source</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/176060">176060</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-12 18:31:04 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176037">r176037</a>. rdar://problems/18869900</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh">branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllerh">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176059 => 176060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 02:30:59 UTC (rev 176059)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 02:31:04 UTC (rev 176060)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r176037. <rdar://problem/18869900>
+
+ 2014-11-12 Tim Horton <timothy_horton@apple.com>
+
+ Need to show the text indicator when Data Detectors shows a popover
+ https://bugs.webkit.org/show_bug.cgi?id=138664
+ <rdar://problem/18869900>
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+ Add new DataDetectors SPI.
+
+
</ins><span class="cx"> 2014-11-11 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for mailto: link action menus
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176059 => 176060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 02:30:59 UTC (rev 176059)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 02:31:04 UTC (rev 176060)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> @property (copy) void (^completionHandler)(void);
</span><span class="cx"> @property (assign) BOOL forActionMenuContent;
</span><span class="cx">
</span><ins>+- (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DDActionsManager : NSObject
</span><span class="lines">@@ -78,4 +80,8 @@
</span><span class="cx"> - (NSArray *)menuItemsForTargetURL:(NSString *)targetURL actionContext:(DDActionContext *)context;
</span><span class="cx"> - (void)requestBubbleClosureUnanchorOnFailure:(BOOL)unanchorOnFailure;
</span><span class="cx">
</span><ins>++ (BOOL)shouldUseActionsWithContext:(DDActionContext *)context;
++ (void)didUseActions;
+
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176059 => 176060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 02:30:59 UTC (rev 176059)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 02:31:04 UTC (rev 176060)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-11-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176037. <rdar://problem/18869900>
+
+ 2014-11-12 Tim Horton <timothy_horton@apple.com>
+
+ Need to show the text indicator when Data Detectors shows a popover
+ https://bugs.webkit.org/show_bug.cgi?id=138664
+ <rdar://problem/18869900>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ (hasDataDetectorsCompletionAPI):
+ Determine if we have the new API.
+
+ (-[WKActionMenuController willDestroyView:]):
+ (-[WKActionMenuController willOpenMenu:withEvent:]):
+ Make use of the new API.
+ If we wanted to show a Data Detectors menu but have no items (or they're all
+ disabled), cancel the menu.
+ If we don't have it, manually manipulate the highlight.
+
+ (-[WKActionMenuController didCloseMenu:withEvent:]):
+ Make use of the new API.
+ If we don't have it, manually manipulate the highlight.
+
+ (-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
+ Set up completion handlers if we have the new API; when DataDetectors
+ presents UI, show the text indicator, when it dismisses, hide it.
+ If we don't have the API, manually manipulate the highlight.
+
+
+2014-11-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r176027. <rdar://problem/18909111>
</span><span class="cx">
</span><span class="cx"> 2014-11-12 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (176059 => 176060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-11-13 02:30:59 UTC (rev 176059)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-11-13 02:31:04 UTC (rev 176060)
</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 WKView;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -68,6 +69,8 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> RetainPtr<WKPagePreviewViewController> _previewViewController;
</span><span class="cx"> #endif
</span><ins>+
+ RetainPtr<DDActionContext> _currentActionContext;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(WKView *)wkView;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176059 => 176060)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 02:30:59 UTC (rev 176059)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 02:31:04 UTC (rev 176060)
</span><span class="lines">@@ -54,6 +54,15 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit)
</span><span class="cx"> SOFT_LINK_CLASS(ImageKit, IKSlideshow)
</span><span class="cx">
</span><ins>+static bool hasDataDetectorsCompletionAPI() {
+ static bool hasCompletionAPI;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ hasCompletionAPI = [getDDActionsManagerClass() respondsToSelector:@selector(shouldUseActionsWithContext:)] && [getDDActionsManagerClass() respondsToSelector:@selector(didUseActions)];
+ });
+ return hasCompletionAPI;
+}
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -156,9 +165,9 @@
</span><span class="cx"> - (void)willDestroyView:(WKView *)view
</span><span class="cx"> {
</span><span class="cx"> _page = nullptr;
</span><del>- _wkView = nullptr;
</del><ins>+ _wkView = nil;
</ins><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><del>-
</del><ins>+ _currentActionContext = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="lines">@@ -192,9 +201,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (_type == kWKActionMenuDataDetectedItem) {
</span><ins>+ if (_currentActionContext && hasDataDetectorsCompletionAPI()) {
+ if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
+ [menu cancelTracking];
+ return;
+ }
+ }
</ins><span class="cx"> if (menu.numberOfItems == 1) {
</span><span class="cx"> _page->clearSelection();
</span><del>- [self _showTextIndicator];
</del><ins>+ if (!hasDataDetectorsCompletionAPI())
+ [self _showTextIndicator];
</ins><span class="cx"> } else
</span><span class="cx"> _page->selectLastActionMenuRange();
</span><span class="cx"> return;
</span><span class="lines">@@ -217,8 +233,15 @@
</span><span class="cx"> if (menu != _wkView.actionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (_type == kWKActionMenuDataDetectedItem && menu.numberOfItems > 1)
- [self _hideTextIndicator];
</del><ins>+ if (_type == kWKActionMenuDataDetectedItem) {
+ if (hasDataDetectorsCompletionAPI()) {
+ if (_currentActionContext)
+ [getDDActionsManagerClass() didUseActions];
+ } else {
+ if (menu.numberOfItems > 1)
+ [self _hideTextIndicator];
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if (!_shouldKeepPreviewPopoverOpen)
</span><span class="cx"> [self _clearPreviewPopover];
</span><span class="lines">@@ -227,6 +250,7 @@
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><span class="cx"> _type = kWKActionMenuNone;
</span><span class="cx"> _sharingServicePicker = nil;
</span><ins>+ _currentActionContext = 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">@@ -560,13 +584,26 @@
</span><span class="cx"> if (!actionContext)
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><del>- actionContext.completionHandler = ^() {
- [self _hideTextIndicator];
- };
</del><ins>+ if (hasDataDetectorsCompletionAPI()) {
+ _currentActionContext = [actionContext contextForView:_wkView altMode:YES interactionStartedHandler:^() {
+ } interactionChangedHandler:^() {
+ [self _showTextIndicator];
+ } interactionStoppedHandler:^() {
+ [self _hideTextIndicator];
+ }];
+ } else {
+ _currentActionContext = actionContext;
</ins><span class="cx">
</span><del>- actionContext.forActionMenuContent = YES;
- actionContext.highlightFrame = [_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]];
- return [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_hitTestResult.actionContext mainResult] actionContext:actionContext];
</del><ins>+ [_currentActionContext setCompletionHandler:^() {
+ [self _hideTextIndicator];
+ }];
+
+ [_currentActionContext setForActionMenuContent:YES];
+ }
+
+ [_currentActionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]]];
+
+ return [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForText
</span></span></pre>
</div>
</div>
</body>
</html>