Changeset 191412 in webkit

Timestamp:

Oct 21, 2015 4:14:31 PM (9 years ago)

Author:

andersca@apple.com

Message:

Move services menu handling out into a separate function
​https://bugs.webkit.org/show_bug.cgi?id=150420

Reviewed by Tim Horton.

• UIProcess/mac/WebContextMenuProxyMac.h:
• UIProcess/mac/WebContextMenuProxyMac.mm:

(WebKit::WebContextMenuProxyMac::showServicesMenu):
(WebKit::WebContextMenuProxyMac::show):
(WebKit::WebContextMenuProxyMac::showContextMenu):
(WebKit::WebContextMenuProxyMac::populate): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.h (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-21  Anders Carlsson  <andersca@apple.com>
+
+        Move services menu handling out into a separate function
+        https://bugs.webkit.org/show_bug.cgi?id=150420
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WebContextMenuProxyMac.h:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::showServicesMenu):
+        (WebKit::WebContextMenuProxyMac::show):
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+        (WebKit::WebContextMenuProxyMac::populate): Deleted.
+
 2015-10-21  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -60 +60 @@
     virtual void show() override;
 
-    void populate(const Vector<RefPtr<WebContextMenuItem>>&);
+    void showContextMenu();
 
 #if ENABLE(SERVICE_CONTROLS)
+    void showServicesMenu();
     void setupServicesMenu();
     WebCore::ContextMenuItem shareMenuItem();

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

@@ -319 +319 @@
 }
 
+void WebContextMenuProxyMac::showServicesMenu()
+{
+    setupServicesMenu();
+
+    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
+    [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
+}
+
 void WebContextMenuProxyMac::clearServicesMenu()
 {
@@ -361 +369 @@
 #endif
 
-void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items)
-{
+void WebContextMenuProxyMac::show()
+{
+    Ref<WebPageProxy> protect(m_page);
+
 #if ENABLE(SERVICE_CONTROLS)
     if (m_context.isServicesMenu()) {
-        setupServicesMenu();
+        showServicesMenu();
         return;
     }
 #endif
 
-    m_menu = [[NSMenu alloc] initWithTitle:@""];
-    [m_menu setAutoenablesItems:NO];
-
-    populateNSMenu(m_menu.get(), nsMenuItemVector(items));
-}
-
-void WebContextMenuProxyMac::show()
-{
-    // Unless this is an image control, give the PageContextMenuClient one last swipe at changing the menu.
-    bool askClientToChangeMenu = true;
-#if ENABLE(SERVICE_CONTROLS)
-    if (m_context.isServicesMenu() || m_context.controlledImage())
-        askClientToChangeMenu = false;
-#endif
-
+    showContextMenu();
+}
+
+void WebContextMenuProxyMac::showContextMenu()
+{
     Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
     for (auto& item : m_context.menuItems()) {
@@ -402 +402 @@
     bool useProposedItems = true;
 
-    if (askClientToChangeMenu && m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
+    if (m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
         useProposedItems = false;
 
     const Vector<RefPtr<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
 
-#if ENABLE(SERVICE_CONTROLS)
-    if (items.isEmpty() && !m_context.isServicesMenu())
-        return;
-#else
     if (items.isEmpty())
         return;
-#endif
-
-    populate(items);
+
+    m_menu = [[NSMenu alloc] initWithTitle:@""];
+    [m_menu setAutoenablesItems:NO];
+
+    populateNSMenu(m_menu.get(), nsMenuItemVector(items));
 
     [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
-
-#if ENABLE(SERVICE_CONTROLS)
-    if (m_context.isServicesMenu())
-        [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
-#endif
-
-    Ref<WebPageProxy> protect(m_page);
-
     [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
 }