<!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>[175966] trunk/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/175966">175966</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 12:12:02 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DataDetectors' menu items aren't presented in the telephone number menu
https://bugs.webkit.org/show_bug.cgi?id=138602
<rdar://problem/18866308>
Reviewed by Beth Dakin.
We currently round-trip the DataDetectors telephone number NSMenuItems
through the very-lossy WebContextMenuItemData, for no real reason.
We should avoid this so that DataDetectors' actual NSMenuItems are
presented in the final menu, so that they can adjust their items after
providing them to us.
* Platform/mac/MenuUtilities.h:
* Platform/mac/MenuUtilities.mm:
(WebKit::menuItemTitleForTelephoneNumber): Deleted.
Stop adjusting the menu item titles, as they come correct now.
(WebKit::menuItemsForTelephoneNumber): Deleted.
(WebKit::menuForTelephoneNumber):
Return a fully-formed menu for the single telephone number case.
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::showTelephoneNumberMenu):
Present the fully-formed menu, without round-tripping through
WebContextMenuItemData, because we do not need to hand the items to
the context menu client (and indeed, were not), and because this
allows us to use the exact items returned by DataDetectors, so they
can keep ahold of the items that we actually present.
* UIProcess/PageClient.h:
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::showPlatformContextMenu):
Add a Mac-only PageClient function for presenting a NSMenu at a
WKView-relative point.
* English.lproj/Localizable.strings:
Remove a now-unused localized string.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacMenuUtilitiesh">trunk/Source/WebKit2/Platform/mac/MenuUtilities.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacMenuUtilitiesmm">trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
+ DataDetectors' menu items aren't presented in the telephone number menu
+ https://bugs.webkit.org/show_bug.cgi?id=138602
+ <rdar://problem/18866308>
+
+ Reviewed by Beth Dakin.
+
+ * English.lproj/Localizable.strings:
+ Remove a now-unused localized string.
+
</ins><span class="cx"> 2014-11-11 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [Frame Flattening] ASSERT(transaction->view == &view()) fails in RenderBlock::removeFromUpdateScrollInfoAfterLayoutTransaction()
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> /* menu item title for phone number */
</span><span class="cx"> "Call Using iPhone:" = "Call Using iPhone:";
</span><span class="cx">
</span><del>-/* menu item for making a telephone call to a telephone number */
-"Call “%@” Using iPhone" = "Call “%@” Using iPhone";
-
</del><span class="cx"> /* File Upload alert sheet button string to cancel */
</span><span class="cx"> "Cancel (file upload action sheet)" = "Cancel";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2014-11-11 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ DataDetectors' menu items aren't presented in the telephone number menu
+ https://bugs.webkit.org/show_bug.cgi?id=138602
+ <rdar://problem/18866308>
+
+ Reviewed by Beth Dakin.
+
+ We currently round-trip the DataDetectors telephone number NSMenuItems
+ through the very-lossy WebContextMenuItemData, for no real reason.
+ We should avoid this so that DataDetectors' actual NSMenuItems are
+ presented in the final menu, so that they can adjust their items after
+ providing them to us.
+
+ * Platform/mac/MenuUtilities.h:
+ * Platform/mac/MenuUtilities.mm:
+ (WebKit::menuItemTitleForTelephoneNumber): Deleted.
+ Stop adjusting the menu item titles, as they come correct now.
+
+ (WebKit::menuItemsForTelephoneNumber): Deleted.
+ (WebKit::menuForTelephoneNumber):
+ Return a fully-formed menu for the single telephone number case.
+
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::showTelephoneNumberMenu):
+ Present the fully-formed menu, without round-tripping through
+ WebContextMenuItemData, because we do not need to hand the items to
+ the context menu client (and indeed, were not), and because this
+ allows us to use the exact items returned by DataDetectors, so they
+ can keep ahold of the items that we actually present.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::showPlatformContextMenu):
+ Add a Mac-only PageClient function for presenting a NSMenu at a
+ WKView-relative point.
+
+2014-11-11 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Adopt DDActionContext menu type SPI
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138603
</span><span class="cx"> <rdar://problem/18867627>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacMenuUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/MenuUtilities.h (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/MenuUtilities.h 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/Platform/mac/MenuUtilities.h 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>-NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumberString);
-NSArray *menuItemsForTelephoneNumber(const String& telephoneNumber);
</del><ins>+NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumber);
+RetainPtr<NSMenu> menuForTelephoneNumber(const String& telephoneNumber);
</ins><span class="cx"> NSString *menuItemTitleForTelephoneNumberGroup();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacMenuUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -53,11 +53,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx">
</span><del>-static NSString *menuItemTitleForTelephoneNumber(const String& telephoneNumber)
-{
- return [NSString stringWithFormat:WEB_UI_STRING("Call “%@” Using iPhone", "menu item for making a telephone call to a telephone number"), formattedPhoneNumberString(telephoneNumber)];
-}
-
</del><span class="cx"> NSString *menuItemTitleForTelephoneNumberGroup()
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("Call Using iPhone:", "menu item title for phone number");
</span><span class="lines">@@ -84,9 +79,9 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSArray *menuItemsForTelephoneNumber(const String& telephoneNumber)
</del><ins>+RetainPtr<NSMenu> menuForTelephoneNumber(const String& telephoneNumber)
</ins><span class="cx"> {
</span><del>- NSMutableArray *items = [NSMutableArray array];
</del><ins>+ RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
</ins><span class="cx"> NSMutableArray *faceTimeItems = [NSMutableArray array];
</span><span class="cx"> NSMenuItem *dialItem = nil;
</span><span class="cx">
</span><span class="lines">@@ -101,7 +96,6 @@
</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><span class="cx"> dialItem = item;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -111,15 +105,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dialItem)
</span><del>- [items addObject:dialItem];
</del><ins>+ [menu addItem:dialItem];
</ins><span class="cx">
</span><span class="cx"> if (faceTimeItems.count) {
</span><del>- if (items.count)
- [items addObject:[NSMenuItem separatorItem]];
- [items addObjectsFromArray:faceTimeItems];
</del><ins>+ if ([menu numberOfItems])
+ [menu addItem:[NSMenuItem separatorItem]];
+ for (NSMenuItem *item in faceTimeItems)
+ [menu addItem:item];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return items.count ? items : nil;
</del><ins>+ return menu;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -237,6 +237,8 @@
</span><span class="cx">
</span><span class="cx"> virtual ColorSpaceData colorSpace() = 0;
</span><span class="cx">
</span><ins>+ virtual void showPlatformContextMenu(NSMenu *, WebCore::IntPoint) = 0;
+
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> virtual WKView* wkView() const = 0;
</span><span class="cx"> virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -188,6 +188,7 @@
</span><span class="cx"> virtual void removeNavigationGestureSnapshot() override;
</span><span class="cx">
</span><span class="cx"> virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, API::Object*) override;
</span><ins>+ virtual void showPlatformContextMenu(NSMenu *, WebCore::IntPoint) override;
</ins><span class="cx">
</span><span class="cx"> WKView *m_wkView;
</span><span class="cx"> WKWebView *m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -766,6 +766,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::showPlatformContextMenu(NSMenu *menu, IntPoint location)
+{
+ [menu popUpMenuPositioningItem:nil atLocation:location inView:m_wkView];
+}
+
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (175965 => 175966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-11-11 19:38:37 UTC (rev 175965)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-11-11 20:12:02 UTC (rev 175966)
</span><span class="lines">@@ -643,21 +643,8 @@
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span><span class="cx"> void WebPageProxy::showTelephoneNumberMenu(const String& telephoneNumber, const WebCore::IntPoint& point)
</span><span class="cx"> {
</span><del>- NSArray *menuItems = menuItemsForTelephoneNumber(telephoneNumber);
-
- Vector<WebContextMenuItemData> items;
- for (NSMenuItem *item in menuItems) {
- RetainPtr<NSMenuItem> retainedItem = item;
- std::function<void()> handler = [retainedItem]() {
- NSMenuItem *item = retainedItem.get();
- [[item target] performSelector:[item action] withObject:item];
- };
-
- items.append(WebContextMenuItemData(ContextMenuItem(item), handler));
- }
-
- ContextMenuContextData contextData(TelephoneNumberContext);
- internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, nullptr);
</del><ins>+ RetainPtr<NSMenu> menu = menuForTelephoneNumber(telephoneNumber);
+ m_pageClient.showPlatformContextMenu(menu.get(), point);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>