Title: [169701] trunk/Source/WebKit2
Revision
169701
Author
beid...@apple.com
Date
2014-06-09 11:43:30 -0700 (Mon, 09 Jun 2014)

Log Message

Use different AppKit API for all services menus
<rdar://problem/16874403> and https://bugs.webkit.org/show_bug.cgi?id=133649

Reviewed by Tim Horton.

* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::showContextMenu):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (169700 => 169701)


--- trunk/Source/WebKit2/ChangeLog	2014-06-09 18:43:22 UTC (rev 169700)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-09 18:43:30 UTC (rev 169701)
@@ -1,3 +1,13 @@
+2014-06-09  Brady Eidson  <beid...@apple.com>
+
+        Use different AppKit API for all services menus
+        <rdar://problem/16874403> and https://bugs.webkit.org/show_bug.cgi?id=133649
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+
 2014-06-09  Anders Carlsson  <ander...@apple.com>
 
         Add WKWindowFeatures.h to the umbrella header.

Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (169700 => 169701)


--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2014-06-09 18:43:22 UTC (rev 169700)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2014-06-09 18:43:30 UTC (rev 169701)
@@ -458,11 +458,11 @@
 
     NSMenu *menu = m_servicesMenu ? m_servicesMenu.get() : [m_popup menu];
 
-    // Telephone number menus must use the [NSMenu popUpMenuPositioningItem:atLocation:inView:] API.
+    // Telephone number and service menus must use the [NSMenu popUpMenuPositioningItem:atLocation:inView:] API.
     // FIXME: That API is better than WKPopupContextMenu. In the future all menus should use either it
     // or the [NSMenu popUpContextMenu:withEvent:forView:] API, depending on the menu type.
     // Then we could get rid of NSPopUpButtonCell, custom metrics, and WKPopupContextMenu.
-    if (context.isTelephoneNumberContext()) {
+    if (context.isTelephoneNumberContext() || context.needsServicesMenu()) {
         [menu popUpMenuPositioningItem:nil atLocation:menuLocation inView:m_webView];
         hideContextMenu();
         return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to