Changeset 192335 in webkit

Timestamp:

Nov 11, 2015, 4:47:29 PM (10 years ago)

Author:

andersca@apple.com

Message:

REGRESSION (r191407): Context menus are missing Services
​https://bugs.webkit.org/show_bug.cgi?id=151167
rdar://problem/23500769

Reviewed by Tim Horton.

• UIProcess/mac/WebContextMenuProxyMac.mm:

(WebKit::WebContextMenuProxyMac::showContextMenu):
Use contentsToRootView to better indicate which coordinate system we're using.

• WebProcess/WebPage/WebContextMenu.cpp:

(WebKit::WebContextMenu::show):
Use +[NSMenu popUpContextMenu:withEvent:forView:] so we'll get service menus where applicable.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.mm (modified) (1 diff)
• WebProcess/WebPage/WebContextMenu.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-11  Anders Carlsson  <andersca@apple.com>
+
+        REGRESSION (r191407): Context menus are missing Services
+        https://bugs.webkit.org/show_bug.cgi?id=151167
+        rdar://problem/23500769
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+        Use contentsToRootView to better indicate which coordinate system we're using.
+
+        * WebProcess/WebPage/WebContextMenu.cpp:
+        (WebKit::WebContextMenu::show):
+        Use +[NSMenu popUpContextMenu:withEvent:forView:] so we'll get service menus where applicable.
+
 2015-11-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm

@@ -392 +392 @@
 
     [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
-    [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
+
+    NSPoint menuLocation = [m_webView convertPoint:m_context.menuLocation() toView:nil];
+    NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseUp location:menuLocation modifierFlags:0 timestamp:0 windowNumber:m_webView.window.windowNumber context:nil eventNumber:0 clickCount:0 pressure:0];
+    [NSMenu popUpContextMenu:m_menu.get() withEvent:event forView:m_webView];
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp

@@ -65 +65 @@
     menuItemsWithUserData(menuItems, userData);
 
-    auto menuLocation = view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame());
+    auto menuLocation = view->contentsToRootView(controller.hitTestResult().roundedPointInInnerNodeFrame());
+
     ContextMenuContextData contextMenuContextData(menuLocation, menuItems, controller.context());