Changeset 191194 in webkit

Timestamp:

Oct 16, 2015 12:52:42 PM (9 years ago)

Author:

andersca@apple.com

Message:

Move more code to WebContextMenuProxyMac
​https://bugs.webkit.org/show_bug.cgi?id=150240

Reviewed by Tim Horton.

• UIProcess/WebContextMenuProxy.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::internalShowContextMenu):

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::contextMenuClient):

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

(WebKit::WebContextMenuProxyMac::initializeShareMenuItem):
(WebKit::WebContextMenuProxyMac::showContextMenu):

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::platformInitializeShareMenuItem): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContextMenuProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/mac/WebContextMenuProxyMac.h (modified) (2 diffs)
• UIProcess/mac/WebContextMenuProxyMac.mm (modified) (4 diffs)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-16  Anders Carlsson  <andersca@apple.com>
+
+        Move more code to WebContextMenuProxyMac
+        https://bugs.webkit.org/show_bug.cgi?id=150240
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/WebContextMenuProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::internalShowContextMenu):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::contextMenuClient):
+        * UIProcess/mac/WebContextMenuProxyMac.h:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::initializeShareMenuItem):
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::platformInitializeShareMenuItem): Deleted.
+
 2015-10-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h

@@ -41 +41 @@
     virtual ~WebContextMenuProxy();
 
-    virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) = 0;
+    virtual void showContextMenu() = 0;
     virtual void hideContextMenu() = 0;
     virtual void cancelTracking() { }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4210 +4210 @@
     m_process->responsivenessTimer()->stop();
 
-    // Unless this is an image control, give the PageContextMenuClient one last swipe at changing the menu.
-    bool askClientToChangeMenu = true;
-#if ENABLE(SERVICE_CONTROLS)
-    if (contextMenuContextData.isServicesMenu() || contextMenuContextData.controlledImage())
-        askClientToChangeMenu = false;
-#endif
-
-    Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
-    for (auto& item : contextMenuContextData.menuItems()) {
-        if (item.action() != ContextMenuItemTagShareMenu) {
-            proposedAPIItems.append(WebContextMenuItem::create(item));
-            continue;
-        }
-
-        ContextMenuItem coreItem = platformInitializeShareMenuItem(contextMenuContextData);
-        if (!coreItem.isNull())
-            proposedAPIItems.append(WebContextMenuItem::create(coreItem));
-    }
-
-    Vector<RefPtr<WebContextMenuItem>> clientItems;
-    bool useProposedItems = true;
-
-    if (askClientToChangeMenu && m_contextMenuClient->getContextMenuFromProposedMenu(*this, proposedAPIItems, clientItems, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
-        useProposedItems = false;
-
-    const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
-    if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
-        m_activeContextMenu->showContextMenu(itemsToShow);
-
-    m_contextMenuClient->contextMenuDismissed(*this);
-}
-
-#if !ENABLE(SERVICE_CONTROLS)
-ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData&)
-{
-    return ContextMenuItem();
-}
-#endif
+    m_activeContextMenu->showContextMenu();
+}
 
 void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item)

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -327 +327 @@
 
 #if ENABLE(CONTEXT_MENUS)
+    API::ContextMenuClient& contextMenuClient() { return *m_contextMenuClient; }
     void setContextMenuClient(std::unique_ptr<API::ContextMenuClient>);
 #endif
@@ -1265 +1266 @@
     void showContextMenu(const ContextMenuContextData&, const UserData&);
     void internalShowContextMenu(const ContextMenuContextData&, const UserData&);
-    WebCore::ContextMenuItem platformInitializeShareMenuItem(const ContextMenuContextData&);
 #endif
 

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

@@ -51 +51 @@
     ~WebContextMenuProxyMac();
 
-    virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) override;
+    virtual void showContextMenu() override;
 
     virtual void hideContextMenu() override;
@@ -72 +72 @@
 #if ENABLE(SERVICE_CONTROLS)
     void setupServicesMenu(const ContextMenuContextData&);
+    WebCore::ContextMenuItem shareMenuItem();
 #endif
 

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

@@ -29 +29 @@
 #if PLATFORM(MAC)
 
+#import "APIContextMenuClient.h"
 #import "DataReference.h"
 #import "MenuUtilities.h"
@@ -252 +253 @@
 
 #if ENABLE(SERVICE_CONTROLS)
-
 void WebContextMenuProxyMac::setupServicesMenu(const ContextMenuContextData& context)
 {
@@ -322 +322 @@
     m_servicesMenu = nullptr;
 }
+
+ContextMenuItem WebContextMenuProxyMac::shareMenuItem()
+{
+    const WebHitTestResultData& hitTestData = m_context.webHitTestResultData();
+
+    URL absoluteLinkURL;
+    if (!hitTestData.absoluteLinkURL.isEmpty())
+        absoluteLinkURL = URL(ParsedURLString, hitTestData.absoluteLinkURL);
+
+    URL downloadableMediaURL;
+    if (!hitTestData.absoluteMediaURL.isEmpty() && hitTestData.isDownloadableMedia)
+        downloadableMediaURL = URL(ParsedURLString, hitTestData.absoluteMediaURL);
+
+    RetainPtr<NSImage> image;
+    if (hitTestData.imageSharedMemory && hitTestData.imageSize)
+        image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
+
+    ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), m_context.selectedText());
+
+    NSMenuItem *nsItem = item.platformDescription();
+
+    NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
+    sharingServicePicker.delegate = [WKSharingServicePickerDelegate sharedSharingServicePickerDelegate];
+
+    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:NO];
+    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:NO];
+    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
+
+    // Setting the picker lets the delegate retain it to keep it alive, but this picker is kept alive by the menu item.
+    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nil];
+
+    return item;
+}
 #endif
 
@@ -346 +379 @@
 }
 
-void WebContextMenuProxyMac::showContextMenu(const Vector<RefPtr<WebContextMenuItem>>& items)
-{
+void WebContextMenuProxyMac::showContextMenu()
+{
+    // 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
+
+    Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
+    for (auto& item : m_context.menuItems()) {
+        if (item.action() != ContextMenuItemTagShareMenu) {
+            proposedAPIItems.append(WebContextMenuItem::create(item));
+            continue;
+        }
+
+#if ENABLE(SERVICE_CONTROLS)
+        proposedAPIItems.append(WebContextMenuItem::create(shareMenuItem()));
+#endif
+    }
+
+    Vector<RefPtr<WebContextMenuItem>> clientItems;
+    bool useProposedItems = true;
+
+    if (askClientToChangeMenu && 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())

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

@@ -739 +739 @@
 }
 
-#if ENABLE(SERVICE_CONTROLS)
-ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData& contextMenuContextData)
-{
-    const WebHitTestResultData& hitTestData = contextMenuContextData.webHitTestResultData();
-
-    URL absoluteLinkURL;
-    if (!hitTestData.absoluteLinkURL.isEmpty())
-        absoluteLinkURL = URL(ParsedURLString, hitTestData.absoluteLinkURL);
-
-    URL downloadableMediaURL;
-    if (!hitTestData.absoluteMediaURL.isEmpty() && hitTestData.isDownloadableMedia)
-        downloadableMediaURL = URL(ParsedURLString, hitTestData.absoluteMediaURL);
-
-    RetainPtr<NSImage> image;
-    if (hitTestData.imageSharedMemory && hitTestData.imageSize)
-        image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
-
-    ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), contextMenuContextData.selectedText());
-
-    NSMenuItem *nsItem = item.platformDescription();
-
-    NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
-    sharingServicePicker.delegate = [WKSharingServicePickerDelegate sharedSharingServicePickerDelegate];
-    
-    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:NO];
-    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:NO];
-    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:static_cast<WebContextMenuProxyMac*>(m_activeContextMenu.get())];
-
-    // Setting the picker lets the delegate retain it to keep it alive, but this picker is kept alive by the menu item.
-    [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nil];
-
-    return item;
-}
-#endif
-
 } // namespace WebKit