<!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>[176793] 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/176793">176793</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 08:35:23 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176763">r176763</a>. rdar://problems/19115662</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</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="#branchessafari6003branchSourceWebKit2SharedAPIcWKActionMenuTypesh">branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKActionMenuTypes.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="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-12-04 Dana Burkart <dburkart@apple.com>
+
+ Merge r176763. <rdar://problem/19115662>
+
+ 2014-12-03 Tim Horton <timothy_horton@apple.com>
+
+ Implement action menus for tel: URLs
+ https://bugs.webkit.org/show_bug.cgi?id=139240
+ <rdar://problem/19115662>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForDataDetectableLink]):
+ Rename this function as it will work for both mailto and tel URLs.
+ Adjust it to use contextForView:.
+
+ (-[WebActionMenuController webView:willHandleMouseDown:]):
+ (-[WebActionMenuController prepareForMenu:withEvent:]):
+ (-[WebActionMenuController didCloseMenu:withEvent:]):
+ (-[WebActionMenuController _defaultMenuItems]):
+ Don't check the menu type when going to interact with _currentActionContext.
+ We'll only have a _currentActionContext if we have a data detected item,
+ and there are multiple menu types that end up using DDActionContext.
+
+ * WebView/WebUIDelegatePrivate.h:
+ Add a new type.
+
+
</ins><span class="cx"> 2014-12-03 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176695. <rdar://problem/19120929>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)webView willHandleMouseDown:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (_type == WebActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
</del><ins>+ if (_currentActionContext && _hasActivatedActionContext) {
</ins><span class="cx"> [getDDActionsManagerClass() didUseActions];
</span><span class="cx"> _hasActivatedActionContext = NO;
</span><span class="cx"> }
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> for (NSMenuItem *item in menuItems)
</span><span class="cx"> [actionMenu addItem:item];
</span><span class="cx">
</span><del>- if (_type == WebActionMenuDataDetectedItem && _currentActionContext) {
</del><ins>+ if (_currentActionContext) {
</ins><span class="cx"> _hasActivatedActionContext = YES;
</span><span class="cx"> if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
</span><span class="cx"> [menu cancelTracking];
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> if (menu != _webView.actionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (_type == WebActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
</del><ins>+ if (_currentActionContext && _hasActivatedActionContext) {
</ins><span class="cx"> [getDDActionsManagerClass() didUseActions];
</span><span class="cx"> _hasActivatedActionContext = NO;
</span><span class="cx"> }
</span><span class="lines">@@ -297,19 +297,24 @@
</span><span class="cx"> return @[ openLinkItem.get(), shouldUseStandardQuickLookPreview ? qlPreviewLinkItem.get() : previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark Mailto Link actions
</del><ins>+#pragma mark mailto: and tel: Link actions
</ins><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForMailtoLink
</del><ins>+- (NSArray *)_defaultMenuItemsForDataDetectableLink
</ins><span class="cx"> {
</span><span class="cx"> Node* node = _hitTestResult.innerNode();
</span><span class="cx"> if (!node)
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
</span><del>- [actionContext setAltMode:YES];
</del><span class="cx">
</span><span class="cx"> // FIXME: Should this show a yellow highlight?
</span><ins>+ _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
+ } interactionChangedHandler:^() {
+ } interactionStoppedHandler:^() {
+ }];
+
</ins><span class="cx"> [actionContext setHighlightFrame:elementBoundingBoxInWindowCoordinatesFromNode(node)];
</span><ins>+
</ins><span class="cx"> return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:_hitTestResult.absoluteLinkURL() actionContext:actionContext.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -847,16 +852,22 @@
</span><span class="cx"> - (NSArray *)_defaultMenuItems
</span><span class="cx"> {
</span><span class="cx"> NSURL *url = _hitTestResult.absoluteLinkURL();
</span><del>- if (url && WebCore::protocolIsInHTTPFamily([url absoluteString])) {
</del><ins>+ NSString *absoluteURLString = [url absoluteString];
+ if (url && WebCore::protocolIsInHTTPFamily(absoluteURLString)) {
</ins><span class="cx"> _type = WebActionMenuLink;
</span><span class="cx"> return [self _defaultMenuItemsForLink];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (url && WebCore::protocolIs([url absoluteString], "mailto")) {
</del><ins>+ if (url && WebCore::protocolIs(absoluteURLString, "mailto")) {
</ins><span class="cx"> _type = WebActionMenuMailtoLink;
</span><del>- return [self _defaultMenuItemsForMailtoLink];
</del><ins>+ return [self _defaultMenuItemsForDataDetectableLink];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (url && WebCore::protocolIs(absoluteURLString, "tel")) {
+ _type = WebActionMenuTelLink;
+ return [self _defaultMenuItemsForDataDetectableLink];
+ }
+
</ins><span class="cx"> Image* image = _hitTestResult.image();
</span><span class="cx"> if (image && !_hitTestResult.absoluteImageURL().isEmpty() && !image->filenameExtension().isEmpty() && image->data() && !image->data()->isEmpty()) {
</span><span class="cx"> _type = WebActionMenuImage;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -140,7 +140,8 @@
</span><span class="cx"> WebActionMenuImage,
</span><span class="cx"> WebActionMenuVideo,
</span><span class="cx"> WebActionMenuDataDetectedItem,
</span><del>- WebActionMenuMailtoLink
</del><ins>+ WebActionMenuMailtoLink,
+ WebActionMenuTelLink
</ins><span class="cx"> } WebActionMenuType;
</span><span class="cx">
</span><span class="cx"> // Message Sources.
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-12-04 Dana Burkart <dburkart@apple.com>
+
+ Merge r176763. <rdar://problem/19115662>
+
+ 2014-12-03 Tim Horton <timothy_horton@apple.com>
+
+ Implement action menus for tel: URLs
+ https://bugs.webkit.org/show_bug.cgi?id=139240
+ <rdar://problem/19115662>
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/c/WKActionMenuTypes.h:
+ Add a new type.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForDataDetectableLink]):
+ Rename this function as it will work for both mailto and tel URLs.
+ Adjust it to use contextForView:.
+
+ (-[WKActionMenuController _clearActionMenuState]):
+ (-[WKActionMenuController menuNeedsUpdate:]):
+ (-[WKActionMenuController _defaultMenuItems]):
+ Don't check the menu type when going to interact with _currentActionContext.
+ We'll only have a _currentActionContext if we have a data detected item,
+ and there are multiple menu types that end up using DDActionContext.
+
+
</ins><span class="cx"> 2014-12-03 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r176753. <rdar://problem/19052381>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2SharedAPIcWKActionMenuTypesh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKActionMenuTypes.h (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKActionMenuTypes.h 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/API/c/WKActionMenuTypes.h 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -42,7 +42,8 @@
</span><span class="cx"> kWKActionMenuEditableTextWithSuggestions,
</span><span class="cx"> kWKActionMenuWhitespaceInEditableArea,
</span><span class="cx"> kWKActionMenuVideo,
</span><del>- kWKActionMenuMailtoLink
</del><ins>+ kWKActionMenuMailtoLink,
+ kWKActionMenuTelLink
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t _WKActionMenuType;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176792 => 176793)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-04 15:54:45 UTC (rev 176792)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-04 16:35:23 UTC (rev 176793)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_clearActionMenuState
</span><span class="cx"> {
</span><del>- if (_type == kWKActionMenuDataDetectedItem && _currentActionContext && _hasActivatedActionContext) {
</del><ins>+ if (_currentActionContext && _hasActivatedActionContext) {
</ins><span class="cx"> [getDDActionsManagerClass() didUseActions];
</span><span class="cx"> _hasActivatedActionContext = NO;
</span><span class="cx"> }
</span><span class="lines">@@ -859,17 +859,22 @@
</span><span class="cx"> return @[ [NSMenuItem separatorItem], [NSMenuItem separatorItem], pasteItem.get() ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark Mailto Link actions
</del><ins>+#pragma mark mailto: and tel: Link actions
</ins><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForMailtoLink
</del><ins>+- (NSArray *)_defaultMenuItemsForDataDetectableLink
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</span><ins>+ RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
</ins><span class="cx">
</span><span class="cx"> // FIXME: Should this show a yellow highlight?
</span><del>- RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
- [actionContext setAltMode:YES];
- [actionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:hitTestResult->elementBoundingBox() toView:nil]]];
- return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:hitTestResult->absoluteLinkURL() actionContext:actionContext.get()];
</del><ins>+ _currentActionContext = [actionContext contextForView:_wkView altMode:YES interactionStartedHandler:^() {
+ } interactionChangedHandler:^() {
+ } interactionStoppedHandler:^() {
+ }];
+
+ [_currentActionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]]];
+
+ return [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:hitTestResult->absoluteLinkURL() actionContext:_currentActionContext.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSMenuDelegate implementation
</span><span class="lines">@@ -891,7 +896,7 @@
</span><span class="cx"> if (_state != ActionMenuState::Ready)
</span><span class="cx"> [self _updateActionMenuItems];
</span><span class="cx">
</span><del>- if (_type == kWKActionMenuDataDetectedItem && _currentActionContext) {
</del><ins>+ if (_currentActionContext) {
</ins><span class="cx"> _hasActivatedActionContext = YES;
</span><span class="cx"> if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()]) {
</span><span class="cx"> [menu cancelTracking];
</span><span class="lines">@@ -1100,8 +1105,13 @@
</span><span class="cx">
</span><span class="cx"> if (protocolIs(absoluteLinkURL, "mailto")) {
</span><span class="cx"> _type = kWKActionMenuMailtoLink;
</span><del>- return [self _defaultMenuItemsForMailtoLink];
</del><ins>+ return [self _defaultMenuItemsForDataDetectableLink];
</ins><span class="cx"> }
</span><ins>+
+ if (protocolIs(absoluteLinkURL, "tel")) {
+ _type = kWKActionMenuTelLink;
+ return [self _defaultMenuItemsForDataDetectableLink];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!hitTestResult->absoluteMediaURL().isEmpty()) {
</span></span></pre>
</div>
</div>
</body>
</html>