<!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>[176215] 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/176215">176215</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-17 11:44:24 -0800 (Mon, 17 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176153">r176153</a>. rdar://problem/18877535</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllerh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebUIDelegatePrivateh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</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="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2014-11-17  Dana Burkart  &lt;dburkart@apple.com&gt;
+
+        Merge r176153. &lt;rdar://problem/18877535&gt;
+
+    2014-11-15  Tim Horton  &lt;timothy_horton@apple.com&gt;
+    
+            Implement data detectors and mailto action menus for WebKit1
+            https://bugs.webkit.org/show_bug.cgi?id=138765
+            &lt;rdar://problem/18877535&gt;
+    
+            Reviewed by Beth Dakin.
+    
+            * WebView/WebActionMenuController.h:
+            * WebView/WebActionMenuController.mm:
+            (-[WebActionMenuController willOpenMenu:withEvent:]):
+            Tell DataDetectors that the menu is going to open.
+            Select the text (or not) based on the number of items in the menu, just like WebKit2.
+    
+            (-[WebActionMenuController didCloseMenu:withEvent:]):
+            Tell DataDetectors that the menu closed.
+    
+            (-[WebActionMenuController _defaultMenuItemsForLink]):
+            Move these checks out of _defaultMenuItemsForLink, because we expect this
+            to always return a complete link menu.
+    
+            (-[WebActionMenuController _defaultMenuItemsForMailtoLink]):
+            Implement. More or less copied from WebKit2.
+    
+            (-[WebActionMenuController _selectDataDetectedText]):
+            Select the stashed range.
+    
+            (-[WebActionMenuController _defaultMenuItemsForDataDetectedText]):
+            Implement. More or less copied from WebKit2.
+            The yellow highlight isn't hooked up yet.
+            Give the client a chance to override via _webView:actionContextForHitTestResult:range:.
+    
+            (-[WebActionMenuController _selectLookupText]):
+            Remove an unnecessary return.
+    
+            (-[WebActionMenuController _defaultMenuItems]):
+            Call into the two new menu types.
+    
+            * WebView/WebUIDelegatePrivate.h:
+    
</ins><span class="cx"> 2014-11-12  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WK1: Support default actions for images
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -29,14 +29,21 @@
</span><span class="cx"> #import &lt;WebCore/HitTestResult.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><ins>+@class DDActionContext;
</ins><span class="cx"> @class WebView;
</span><span class="cx"> 
</span><ins>+namespace WebCore {
+class Range;
+}
+
</ins><span class="cx"> @interface WebActionMenuController : NSObject &lt;NSSharingServiceDelegate, NSSharingServicePickerDelegate&gt; {
</span><span class="cx"> @private
</span><span class="cx">     WebView *_webView;
</span><span class="cx">     WebActionMenuType _type;
</span><span class="cx">     WebCore::HitTestResult _hitTestResult;
</span><span class="cx">     RetainPtr&lt;NSSharingServicePicker&gt; _sharingServicePicker;
</span><ins>+    RetainPtr&lt;DDActionContext&gt; _currentActionContext;
+    RefPtr&lt;WebCore::Range&gt; _currentDetectedDataRange;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (id)initWithWebView:(WebView *)webView;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import &quot;DOMElementInternal.h&quot;
</span><span class="cx"> #import &quot;DOMNodeInternal.h&quot;
</span><ins>+#import &quot;DOMRangeInternal.h&quot;
</ins><span class="cx"> #import &quot;WebDocumentInternal.h&quot;
</span><span class="cx"> #import &quot;WebElementDictionary.h&quot;
</span><span class="cx"> #import &quot;WebFrameInternal.h&quot;
</span><span class="lines">@@ -37,6 +38,8 @@
</span><span class="cx"> #import &quot;WebViewInternal.h&quot;
</span><span class="cx"> #import &lt;ImageIO/ImageIO.h&gt;
</span><span class="cx"> #import &lt;ImageKit/ImageKit.h&gt;
</span><ins>+#import &lt;WebCore/DataDetection.h&gt;
+#import &lt;WebCore/DataDetectorsSPI.h&gt;
</ins><span class="cx"> #import &lt;WebCore/DictionaryLookup.h&gt;
</span><span class="cx"> #import &lt;WebCore/Editor.h&gt;
</span><span class="cx"> #import &lt;WebCore/Element.h&gt;
</span><span class="lines">@@ -146,6 +149,19 @@
</span><span class="cx">     if (menu != _webView.actionMenu)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (_type == WebActionMenuDataDetectedItem) {
+        if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
+            [menu cancelTracking];
+            return;
+        }
+
+        if (menu.numberOfItems == 1)
+            [[_webView _selectedOrMainFrame] _clearSelection];
+        else
+            [self _selectDataDetectedText];
+        return;
+    }
+
</ins><span class="cx">     if (![self isMenuForTextContent]) {
</span><span class="cx">         [[_webView _selectedOrMainFrame] _clearSelection];
</span><span class="cx">         return;
</span><span class="lines">@@ -162,6 +178,9 @@
</span><span class="cx">     if (menu != _webView.actionMenu)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (_type == WebActionMenuDataDetectedItem &amp;&amp; _currentActionContext)
+        [getDDActionsManagerClass() didUseActions];
+
</ins><span class="cx">     _type = WebActionMenuNone;
</span><span class="cx">     _sharingServicePicker = nil;
</span><span class="cx"> }
</span><span class="lines">@@ -251,13 +270,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForLink:(WebElementDictionary *)hitTestResult
</span><span class="cx"> {
</span><del>-    NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
-    if (!url)
-        return @[ ];
-
-    if (!WebCore::protocolIsInHTTPFamily([url absoluteString]))
-        return @[ ];
-
</del><span class="cx">     RetainPtr&lt;NSMenuItem&gt; openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser withHitTestResult:hitTestResult];
</span><span class="cx">     RetainPtr&lt;NSMenuItem&gt; previewLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPreviewLink withHitTestResult:hitTestResult];
</span><span class="cx">     RetainPtr&lt;NSMenuItem&gt; readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList withHitTestResult:hitTestResult];
</span><span class="lines">@@ -265,6 +277,22 @@
</span><span class="cx">     return @[ openLinkItem.get(), previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#pragma mark Mailto Link actions
+
+- (NSArray *)_defaultMenuItemsForMailtoLink
+{
+    Node* node = _hitTestResult.innerNode();
+    if (!node)
+        return @[ ];
+
+    RetainPtr&lt;DDActionContext&gt; actionContext = [[getDDActionContextClass() alloc] init];
+    [actionContext setForActionMenuContent:YES];
+
+    // FIXME: Should this show a yellow highlight?
+    [actionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
+    return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:_hitTestResult.absoluteLinkURL() actionContext:actionContext.get()];
+}
+
</ins><span class="cx"> #pragma mark Image actions
</span><span class="cx"> 
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForImage:(WebElementDictionary *)hitTestResult
</span><span class="lines">@@ -448,6 +476,46 @@
</span><span class="cx">     return @[ copyTextItem.get(), lookupTextItem.get(), pasteItem.get(), textSuggestionsItem.get() ];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_selectDataDetectedText
+{
+    [_webView _mainCoreFrame]-&gt;selection().setSelectedRange(_currentDetectedDataRange.get(), DOWNSTREAM, true);
+}
+
+- (NSArray *)_defaultMenuItemsForDataDetectedText
+{
+    RefPtr&lt;Range&gt; detectedDataRange;
+    FloatRect detectedDataBoundingBox;
+    RetainPtr&lt;DDActionContext&gt; actionContext;
+
+    if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:actionContextForHitTestResult:range:)]) {
+        RetainPtr&lt;WebElementDictionary&gt; hitTestDictionary = adoptNS([[WebElementDictionary alloc] initWithHitTestResult:_hitTestResult]);
+
+        DOMRange *customDataDetectorsRange;
+        actionContext = [[_webView UIDelegate] _webView:_webView actionContextForHitTestResult:hitTestDictionary.get() range:&amp;customDataDetectorsRange];
+
+        if (actionContext &amp;&amp; customDataDetectorsRange)
+            detectedDataRange = core(customDataDetectorsRange);
+    }
+
+    // If the client didn't give us an action context, try to scan around the hit point.
+    if (!actionContext || !detectedDataRange)
+        actionContext = DataDetection::detectItemAroundHitTestResult(_hitTestResult, detectedDataBoundingBox, detectedDataRange);
+
+    if (!actionContext || !detectedDataRange)
+        return @[ ];
+
+    // FIXME: We should hide/show the yellow highlight here.
+    _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
+    } interactionChangedHandler:^() {
+    } interactionStoppedHandler:^() {
+    }];
+    _currentDetectedDataRange = detectedDataRange;
+
+    [_currentActionContext setHighlightFrame:[_webView.window convertRectToScreen:[_webView convertRect:detectedDataBoundingBox toView:nil]]];
+
+    return [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
+}
+
</ins><span class="cx"> - (void)_copySelection:(id)sender
</span><span class="cx"> {
</span><span class="cx">     [_webView _executeCoreCommandByName:@&quot;copy&quot; value:nil];
</span><span class="lines">@@ -488,7 +556,6 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     frame-&gt;selection().setSelectedRange(lookupRange.get(), DOWNSTREAM, true);
</span><del>-    return;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_changeSelectionToSuggestion:(id)sender
</span><span class="lines">@@ -686,11 +753,16 @@
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForHitTestResult:(WebElementDictionary *)hitTestResult
</span><span class="cx"> {
</span><span class="cx">     NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
</span><del>-    if (url) {
</del><ins>+    if (url &amp;&amp; WebCore::protocolIsInHTTPFamily([url absoluteString])) {
</ins><span class="cx">         _type = WebActionMenuLink;
</span><span class="cx">         return [self _defaultMenuItemsForLink:hitTestResult];
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (url &amp;&amp; WebCore::protocolIs([url absoluteString], &quot;mailto&quot;)) {
+        _type = WebActionMenuMailtoLink;
+        return [self _defaultMenuItemsForMailtoLink];
+    }
+
</ins><span class="cx">     if (_hitTestResult.image() &amp;&amp; !_hitTestResult.absoluteImageURL().isEmpty()) {
</span><span class="cx">         _type = WebActionMenuImage;
</span><span class="cx">         return [self _defaultMenuItemsForImage:hitTestResult];
</span><span class="lines">@@ -698,6 +770,12 @@
</span><span class="cx"> 
</span><span class="cx">     Node* node = _hitTestResult.innerNode();
</span><span class="cx">     if (node &amp;&amp; node-&gt;isTextNode()) {
</span><ins>+        NSArray *dataDetectorMenuItems = [self _defaultMenuItemsForDataDetectedText];
+        if (dataDetectorMenuItems.count) {
+            _type = WebActionMenuDataDetectedItem;
+            return dataDetectorMenuItems;
+        }
+
</ins><span class="cx">         if (_hitTestResult.isContentEditable()) {
</span><span class="cx">             NSArray *editableTextWithSuggestions = [self _defaultMenuItemsForEditableTextWithSuggestions:hitTestResult];
</span><span class="cx">             if (editableTextWithSuggestions.count) {
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -134,7 +134,9 @@
</span><span class="cx">     WebActionMenuEditableText,
</span><span class="cx">     WebActionMenuWhitespaceInEditableArea,
</span><span class="cx">     WebActionMenuEditableTextWithSuggestions,
</span><del>-    WebActionMenuImage
</del><ins>+    WebActionMenuImage,
+    WebActionMenuDataDetectedItem,
+    WebActionMenuMailtoLink
</ins><span class="cx"> } WebActionMenuType;
</span><span class="cx"> 
</span><span class="cx"> // Message Sources.
</span><span class="lines">@@ -155,8 +157,10 @@
</span><span class="cx"> extern NSString *WebConsoleMessageWarningMessageLevel;
</span><span class="cx"> extern NSString *WebConsoleMessageErrorMessageLevel;
</span><span class="cx"> 
</span><ins>+@class DDActionContext;
</ins><span class="cx"> @class DOMElement;
</span><span class="cx"> @class DOMNode;
</span><ins>+@class DOMRange;
</ins><span class="cx"> @class WebSecurityOrigin;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE_FULLSCREEN_API
</span><span class="lines">@@ -219,6 +223,7 @@
</span><span class="cx"> - (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
</span><span class="cx"> - (void)webView:(WebView *)sender saveFrameView:(WebFrameView *)frameView showingPanel:(BOOL)showingPanel;
</span><span class="cx"> - (NSArray *)_webView:(WebView *)sender actionMenuItemsForHitTestResult:(NSDictionary *)hitTestResult withType:(WebActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems;
</span><ins>+- (DDActionContext *)_webView:(WebView *)sender actionContextForHitTestResult:(NSDictionary *)hitTestResult range:(DOMRange **)range;
</ins><span class="cx"> #endif
</span><span class="cx"> - (BOOL)webView:(WebView *)sender didPressMissingPluginButton:(DOMElement *)element;
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-11-17  Dana Burkart  &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r176153. &lt;rdar://problem/18877535&gt;
+
+    2014-11-15  Tim Horton  &lt;timothy_horton@apple.com&gt;
+    
+            Implement data detectors and mailto action menus for WebKit1
+            https://bugs.webkit.org/show_bug.cgi?id=138765
+            &lt;rdar://problem/18877535&gt;
+    
+            Reviewed by Beth Dakin.
+    
+            * UIProcess/mac/WKActionMenuController.mm:
+            (-[WKActionMenuController _defaultMenuItemsForMailtoLink]):
+    
+2014-11-17  Dana Burkart  &lt;dburkart@apple.com&gt;
+
</ins><span class="cx">         Merge r176137. &lt;rdar://problem/18877535&gt;
</span><span class="cx"> 
</span><span class="cx">     2014-11-14  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176214 => 176215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm        2014-11-17 19:36:58 UTC (rev 176214)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm        2014-11-17 19:44:24 UTC (rev 176215)
</span><span class="lines">@@ -702,6 +702,7 @@
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;WebHitTestResult&gt; hitTestResult = [self _webHitTestResult];
</span><span class="cx"> 
</span><ins>+    // FIXME: Should this show a yellow highlight?
</ins><span class="cx">     RetainPtr&lt;DDActionContext&gt; actionContext = [[getDDActionContextClass() alloc] init];
</span><span class="cx">     [actionContext setForActionMenuContent:YES];
</span><span class="cx">     [actionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:hitTestResult-&gt;elementBoundingBox() toView:nil]]];
</span></span></pre>
</div>
</div>

</body>
</html>