Changeset 169079 in webkit

Timestamp:

May 19, 2014, 3:41:18 PM (12 years ago)

Author:

beidson@apple.com

Message:

Use different AppKit API for image control menus.
<rdar://problem/16807828> and ​https://bugs.webkit.org/show_bug.cgi?id=133087

Reviewed by Tim Horton.

For image control menus, use popUpMenuPositioningItem: instead of popUpContextMenu:

• WebCoreSupport/WebContextMenuClient.h:
• WebCoreSupport/WebContextMenuClient.mm:

(WebContextMenuClient::contextMenuForEvent):
(WebContextMenuClient::showContextMenu):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebContextMenuClient.h (modified) (1 diff)
• WebCoreSupport/WebContextMenuClient.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-05-19  Brady Eidson  <beidson@apple.com>
+
+        Use different AppKit API for image control menus.
+        <rdar://problem/16807828> and https://bugs.webkit.org/show_bug.cgi?id=133087
+
+        Reviewed by Tim Horton.
+
+        For image control menus, use popUpMenuPositioningItem: instead of popUpContextMenu:
+        
+        * WebCoreSupport/WebContextMenuClient.h:
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::contextMenuForEvent):
+        (WebContextMenuClient::showContextMenu):
+
 2014-05-19  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h

@@ -66 +66 @@
         
 private:
-    NSMenu *contextMenuForEvent(NSEvent *, NSView *);
+    NSMenu *contextMenuForEvent(NSEvent *, NSView *, bool& isServicesMenu);
 
     bool clientFloatRectForNode(WebCore::Node&, WebCore::FloatRect&) const;

trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm

@@ -461 +461 @@
 
 
-NSMenu *WebContextMenuClient::contextMenuForEvent(NSEvent *event, NSView *view)
-{
+NSMenu *WebContextMenuClient::contextMenuForEvent(NSEvent *event, NSView *view, bool& isServicesMenu)
+{
+    isServicesMenu = false;
+
     Page* page = [m_webView page];
     if (!page)
@@ -477 +479 @@
         bool isContentEditable = page->contextMenuController().context().hitTestResult().innerNode()->isContentEditable();
         m_sharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithData:(NSData *)cfData.get() includeEditorServices:isContentEditable menuClient:this]);
-        
+
+        isServicesMenu = true;
         return [m_sharingServicePickerController menu];
     }
@@ -502 +505 @@
 
     // Show the contextual menu for this event.
-    if (NSMenu *menu = contextMenuForEvent(event, view))
-        [NSMenu popUpContextMenu:menu withEvent:event forView:view];
+    bool isServicesMenu;
+    if (NSMenu *menu = contextMenuForEvent(event, view, isServicesMenu)) {
+        if (isServicesMenu)
+            [menu popUpMenuPositioningItem:nil atLocation:[view convertPoint:point toView:nil] inView:view];
+        else
+            [NSMenu popUpContextMenu:menu withEvent:event forView:view];
+    }
 }