Title: [191468] trunk/Source/WebKit2
- Revision
- 191468
- Author
- [email protected]
- Date
- 2015-10-22 13:13:54 -0700 (Thu, 22 Oct 2015)
Log Message
Wait to convert the share menu item to a real share menu until after calling out to the client
https://bugs.webkit.org/show_bug.cgi?id=150465
Reviewed by Tim Horton.
This will let us simplify more code in upcoming patches.
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItem):
(WebKit::nsMenuItemVector):
(WebKit::WebContextMenuProxyMac::showContextMenu):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191467 => 191468)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 19:59:54 UTC (rev 191467)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 20:13:54 UTC (rev 191468)
@@ -1,3 +1,18 @@
+2015-10-22 Anders Carlsson <[email protected]>
+
+ Wait to convert the share menu item to a real share menu until after calling out to the client
+ https://bugs.webkit.org/show_bug.cgi?id=150465
+
+ Reviewed by Tim Horton.
+
+ This will let us simplify more code in upcoming patches.
+
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::nsMenuItem):
+ (WebKit::nsMenuItemVector):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+
2015-10-22 Myles C. Maxfield <[email protected]>
[Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191467 => 191468)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-22 19:59:54 UTC (rev 191467)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-22 20:13:54 UTC (rev 191468)
@@ -64,7 +64,10 @@
#if ENABLE(SERVICE_CONTROLS)
void showServicesMenu();
void setupServicesMenu();
+// FIXME: This shouldn't be public.
+public:
WebCore::ContextMenuItem shareMenuItem();
+private:
#endif
RetainPtr<NSMenu> m_menu;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191467 => 191468)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 19:59:54 UTC (rev 191467)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 20:13:54 UTC (rev 191468)
@@ -181,10 +181,15 @@
}
}
-template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(const Vector<ItemType>&);
+template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(WebContextMenuProxyMac&, const Vector<ItemType>&);
-static RetainPtr<NSMenuItem> nsMenuItem(const WebContextMenuItemData& item)
+static RetainPtr<NSMenuItem> nsMenuItem(WebContextMenuProxyMac& contextMenuProxy, const WebContextMenuItemData& item)
{
+#if ENABLE(SERVICE_CONTROLS)
+ if (item.action() == ContextMenuItemTagShareMenu)
+ return contextMenuProxy.shareMenuItem().platformDescription();
+#endif
+
switch (item.type()) {
case ActionType:
case CheckableActionType: {
@@ -208,7 +213,7 @@
case SubmenuType: {
NSMenu* menu = [[NSMenu alloc] initWithTitle:nsStringFromWebCoreString(item.title())];
[menu setAutoenablesItems:NO];
- populateNSMenu(menu, nsMenuItemVector(item.submenu()));
+ populateNSMenu(menu, nsMenuItemVector(contextMenuProxy, item.submenu()));
NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(item.title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
[menuItem setEnabled:item.enabled()];
@@ -222,23 +227,23 @@
}
}
-static RetainPtr<NSMenuItem> nsMenuItem(const RefPtr<WebContextMenuItem>& item)
+static RetainPtr<NSMenuItem> nsMenuItem(WebContextMenuProxyMac& contextMenuProxy, const RefPtr<WebContextMenuItem>& item)
{
if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
return nativeItem->nsMenuItem();
ASSERT(item->data());
- return nsMenuItem(*item->data());
+ return nsMenuItem(contextMenuProxy, *item->data());
}
-template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(const Vector<ItemType>& items)
+template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(WebContextMenuProxyMac& contextMenuProxy, const Vector<ItemType>& items)
{
Vector<RetainPtr<NSMenuItem>> result;
unsigned size = items.size();
result.reserveCapacity(size);
for (auto& item : items)
- result.uncheckedAppend(nsMenuItem(item));
+ result.uncheckedAppend(nsMenuItem(contextMenuProxy, item));
WKMenuTarget* target = [WKMenuTarget sharedMenuTarget];
for (auto& item : result)
@@ -385,19 +390,9 @@
void WebContextMenuProxyMac::showContextMenu()
{
Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
- for (auto& item : m_context.menuItems()) {
- if (item.action() != ContextMenuItemTagShareMenu) {
- proposedAPIItems.append(WebContextMenuItem::create(item));
- continue;
- }
+ for (auto& item : m_context.menuItems())
+ proposedAPIItems.append(WebContextMenuItem::create(item));
-#if ENABLE(SERVICE_CONTROLS)
- ContextMenuItem shareItem = shareMenuItem();
- if (!shareItem.isNull())
- proposedAPIItems.append(WebContextMenuItem::create(shareItem));
-#endif
- }
-
Vector<RefPtr<WebContextMenuItem>> clientItems;
bool useProposedItems = true;
@@ -412,7 +407,7 @@
m_menu = [[NSMenu alloc] initWithTitle:@""];
[m_menu setAutoenablesItems:NO];
- populateNSMenu(m_menu.get(), nsMenuItemVector(items));
+ populateNSMenu(m_menu.get(), nsMenuItemVector(*this, items));
[[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
[m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes