Title: [191482] trunk/Source/WebKit2
- Revision
- 191482
- Author
- [email protected]
- Date
- 2015-10-22 15:27:19 -0700 (Thu, 22 Oct 2015)
Log Message
Simplify menu creation
https://bugs.webkit.org/show_bug.cgi?id=150476
Reviewed by Tim Horton.
Instead of creating vectors of NSMenuItem objects, just simply build the menu recursively.
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::createContextMenuFromItems):
(WebKit::WebContextMenuProxyMac::createContextMenuItem):
(WebKit::WebContextMenuProxyMac::showContextMenu):
(WebKit::populateNSMenu): Deleted.
(WebKit::nsMenuItem): Deleted.
(WebKit::nsMenuItemVector): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191481 => 191482)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 22:25:14 UTC (rev 191481)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 22:27:19 UTC (rev 191482)
@@ -1,3 +1,21 @@
+2015-10-22 Anders Carlsson <[email protected]>
+
+ Simplify menu creation
+ https://bugs.webkit.org/show_bug.cgi?id=150476
+
+ Reviewed by Tim Horton.
+
+ Instead of creating vectors of NSMenuItem objects, just simply build the menu recursively.
+
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::createContextMenuFromItems):
+ (WebKit::WebContextMenuProxyMac::createContextMenuItem):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ (WebKit::populateNSMenu): Deleted.
+ (WebKit::nsMenuItem): Deleted.
+ (WebKit::nsMenuItemVector): Deleted.
+
2015-10-22 Carlos Garcia Campos <[email protected]>
ERROR: Unhandled web process message 'StorageAreaMap:DispatchStorageEvent'
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191481 => 191482)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-22 22:25:14 UTC (rev 191481)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-22 22:27:19 UTC (rev 191482)
@@ -59,15 +59,14 @@
private:
virtual void show() override;
+ RetainPtr<NSMenuItem> createContextMenuItem(const WebContextMenuItemData&);
+ RetainPtr<NSMenu> createContextMenuFromItems(const Vector<WebContextMenuItemData>&);
void showContextMenu();
#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 (191481 => 191482)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 22:25:14 UTC (rev 191481)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-22 22:27:19 UTC (rev 191482)
@@ -172,85 +172,7 @@
m_page.contextMenuItemSelected(item);
}
-static void populateNSMenu(NSMenu* menu, const Vector<RetainPtr<NSMenuItem>>& menuItemVector)
-{
- for (unsigned i = 0; i < menuItemVector.size(); ++i) {
- NSInteger oldState = [menuItemVector[i].get() state];
- [menu addItem:menuItemVector[i].get()];
- [menuItemVector[i].get() setState:oldState];
- }
-}
-
-template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(WebContextMenuProxyMac&, const Vector<ItemType>&);
-
-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: {
- NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(item.title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
- [menuItem setTag:item.action()];
- [menuItem setEnabled:item.enabled()];
- [menuItem setState:item.checked() ? NSOnState : NSOffState];
-
- if (item.userData()) {
- WKUserDataWrapper *wrapper = [[WKUserDataWrapper alloc] initWithUserData:item.userData()];
- [menuItem setRepresentedObject:wrapper];
- [wrapper release];
- }
-
- return adoptNS(menuItem);
- break;
- }
- case SeparatorType:
- return [NSMenuItem separatorItem];
- break;
- case SubmenuType: {
- NSMenu* menu = [[NSMenu alloc] initWithTitle:nsStringFromWebCoreString(item.title())];
- [menu setAutoenablesItems:NO];
- populateNSMenu(menu, nsMenuItemVector(contextMenuProxy, item.submenu()));
-
- NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:nsStringFromWebCoreString(item.title()) action:@selector(forwardContextMenuAction:) keyEquivalent:@""];
- [menuItem setEnabled:item.enabled()];
- [menuItem setSubmenu:menu];
- [menu release];
-
- return adoptNS(menuItem);
- }
- default:
- ASSERT_NOT_REACHED();
- }
-}
-
-static RetainPtr<NSMenuItem> nsMenuItem(WebContextMenuProxyMac& contextMenuProxy, const RefPtr<WebContextMenuItem>& item)
-{
- return nsMenuItem(contextMenuProxy, item->data());
-}
-
-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) {
- if (auto menuItem = nsMenuItem(contextMenuProxy, item))
- result.uncheckedAppend(menuItem);
- }
-
- WKMenuTarget* target = [WKMenuTarget sharedMenuTarget];
- for (auto& item : result)
- [item.get() setTarget:target];
-
- return result;
-}
-
-#if ENABLE(SERVICE_CONTROLS)
void WebContextMenuProxyMac::setupServicesMenu()
{
bool includeEditorServices = m_context.controlledDataIsEditable();
@@ -385,6 +307,57 @@
showContextMenu();
}
+RetainPtr<NSMenu> WebContextMenuProxyMac::createContextMenuFromItems(const Vector<WebContextMenuItemData>& items)
+{
+ auto menu = adoptNS([[NSMenu alloc] initWithTitle:@""]);
+ [menu setAutoenablesItems:NO];
+
+ for (auto& item : items) {
+ if (auto menuItem = createContextMenuItem(item))
+ [menu addItem:menuItem.get()];
+ }
+
+ return menu;
+}
+
+RetainPtr<NSMenuItem> WebContextMenuProxyMac::createContextMenuItem(const WebContextMenuItemData& item)
+{
+#if ENABLE(SERVICE_CONTROLS)
+ if (item.action() == ContextMenuItemTagShareMenu)
+ return shareMenuItem().platformDescription();
+#endif
+
+ switch (item.type()) {
+ case ActionType:
+ case CheckableActionType: {
+ auto menuItem = adoptNS([[NSMenuItem alloc] initWithTitle:item.title() action:@selector(forwardContextMenuAction:) keyEquivalent:@""]);
+
+ [menuItem setTag:item.action()];
+ [menuItem setEnabled:item.enabled()];
+ [menuItem setState:item.checked() ? NSOnState : NSOffState];
+ [menuItem setTarget:[WKMenuTarget sharedMenuTarget]];
+
+ if (item.userData()) {
+ auto wrapper = adoptNS([[WKUserDataWrapper alloc] initWithUserData:item.userData()]);
+ [menuItem setRepresentedObject:wrapper.get()];
+ }
+
+ return menuItem;
+ }
+
+ case SeparatorType:
+ return [NSMenuItem separatorItem];
+
+ case SubmenuType: {
+ auto menuItem = adoptNS([[NSMenuItem alloc] initWithTitle:item.title() action:nullptr keyEquivalent:@""]);
+ [menuItem setEnabled:item.enabled()];
+ [menuItem setSubmenu:createContextMenuFromItems(item.submenu()).get()];
+
+ return menuItem;
+ }
+ }
+}
+
void WebContextMenuProxyMac::showContextMenu()
{
Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
@@ -397,16 +370,15 @@
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;
+ Vector<WebContextMenuItemData> items;
+ for (auto& item : (useProposedItems ? proposedAPIItems : clientItems))
+ items.append(item->data());
if (items.isEmpty())
return;
- m_menu = [[NSMenu alloc] initWithTitle:@""];
- [m_menu setAutoenablesItems:NO];
+ m_menu = createContextMenuFromItems(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