<!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>[172467] branches/safari-600.1-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/172467">172467</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 07:22:52 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172424">r172424</a>. <rdar://problem/17936880></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreEnglishlprojLocalizablestrings">branches/safari-600.1-branch/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2PlatformmacMenuUtilitiesh">branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2PlatformmacMenuUtilitiesmm">branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172424
+
+ 2014-08-11 Enrica Casucci <enrica@apple.com>
+
+ Improve look and feel of combined service menu..
+ https://bugs.webkit.org/show_bug.cgi?id=135824
+ <rdar://problem/17936880>
+
+ Reviewed by Tim Horton.
+
+ Adding some localizable strings.
+
+ * English.lproj/Localizable.strings:
+
+2014-08-12 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172428
</span><span class="cx">
</span><span class="cx"> 2014-08-11 Mark Rowe <mrowe@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/English.lproj/Localizable.strings (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/English.lproj/Localizable.strings 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebCore/English.lproj/Localizable.strings 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -118,6 +118,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Bold (Undo action name)" = "Bold";
</span><span class="cx">
</span><ins>+/* menu item title for phone number */
+"Call Using iPhone:" = "Call Using iPhone:";
+
</ins><span class="cx"> /* menu item for making a telephone call to a telephone number */
</span><span class="cx"> "Call “%@” Using iPhone" = "Call “%@” Using iPhone";
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172424
+
+ 2014-08-11 Enrica Casucci <enrica@apple.com>
+
+ Improve look and feel of combined service menu..
+ https://bugs.webkit.org/show_bug.cgi?id=135824
+ <rdar://problem/17936880>
+
+ Reviewed by Tim Horton.
+
+ When showing the combined menu, list the phone numbers first,
+ grouped under a common header, followed by the entries relative
+ to the services.
+
+ * Platform/mac/MenuUtilities.h:
+ * Platform/mac/MenuUtilities.mm:
+ (WebKit::menuItemTitleForTelephoneNumberGroup):
+ (WebKit::menuItemForTelephoneNumber):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+
+2014-08-12 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172406
</span><span class="cx">
</span><span class="cx"> 2014-08-11 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2PlatformmacMenuUtilitiesh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.h (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.h 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.h 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumberString);
</span><span class="cx"> NSArray *menuItemsForTelephoneNumber(const String& telephoneNumber);
</span><ins>+NSString *menuItemTitleForTelephoneNumberGroup();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2PlatformmacMenuUtilitiesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -58,6 +58,11 @@
</span><span class="cx"> return [NSString stringWithFormat:WEB_UI_STRING("Call “%@” Using iPhone", "menu item for making a telephone call to a telephone number"), formattedPhoneNumberString(telephoneNumber)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NSString *menuItemTitleForTelephoneNumberGroup()
+{
+ return WEB_UI_STRING("Call Using iPhone:", "menu item title for phone number");
+}
+
</ins><span class="cx"> NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumber)
</span><span class="cx"> {
</span><span class="cx"> NSArray *proposedMenu = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:nil];
</span><span class="lines">@@ -71,7 +76,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if ([actionObject.actionUTI hasPrefix:@"com.apple.dial"]) {
</span><del>- item.title = menuItemTitleForTelephoneNumber(telephoneNumber);
</del><ins>+ item.title = formattedPhoneNumberString(telephoneNumber);
</ins><span class="cx"> return item;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (172466 => 172467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-12 14:20:59 UTC (rev 172466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-08-12 14:22:52 UTC (rev 172467)
</span><span class="lines">@@ -407,12 +407,18 @@
</span><span class="cx"> const Vector<String>& selectedTelephoneNumbers = context.selectedTelephoneNumbers();
</span><span class="cx"> if (!selectedTelephoneNumbers.isEmpty()) {
</span><span class="cx"> if (m_servicesMenu)
</span><del>- [m_servicesMenu addItem:[NSMenuItem separatorItem]];
</del><ins>+ [m_servicesMenu insertItem:[NSMenuItem separatorItem] atIndex:0];
</ins><span class="cx"> else
</span><span class="cx"> m_servicesMenu = adoptNS([[NSMenu alloc] init]);
</span><ins>+ int itemPosition = 0;
+ NSMenuItem *groupEntry = [[NSMenuItem alloc] initWithTitle:menuItemTitleForTelephoneNumberGroup() action:nil keyEquivalent:@""];
+ [groupEntry setEnabled:NO];
+ [m_servicesMenu insertItem:groupEntry atIndex:itemPosition++];
</ins><span class="cx"> for (auto& telephoneNumber : selectedTelephoneNumbers) {
</span><del>- if (NSMenuItem *item = menuItemForTelephoneNumber(telephoneNumber))
- [m_servicesMenu addItem:item];
</del><ins>+ if (NSMenuItem *item = menuItemForTelephoneNumber(telephoneNumber)) {
+ [item setIndentationLevel:1];
+ [m_servicesMenu insertItem:item atIndex:itemPosition++];
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>