<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191482] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191482">191482</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 15:27:19 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191481 => 191482)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-22 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-10-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> ERROR: Unhandled web process message 'StorageAreaMap:DispatchStorageEvent'
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191481 => 191482)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,15 +59,14 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void show() override;
</span><span class="cx">
</span><ins>+ RetainPtr<NSMenuItem> createContextMenuItem(const WebContextMenuItemData&);
+ RetainPtr<NSMenu> createContextMenuFromItems(const Vector<WebContextMenuItemData>&);
</ins><span class="cx"> void showContextMenu();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void showServicesMenu();
</span><span class="cx"> void setupServicesMenu();
</span><del>-// FIXME: This shouldn't be public.
-public:
</del><span class="cx"> WebCore::ContextMenuItem shareMenuItem();
</span><del>-private:
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMenu> m_menu;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191481 => 191482)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -172,85 +172,7 @@
</span><span class="cx"> m_page.contextMenuItemSelected(item);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
-{
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- 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)
</del><span class="cx"> void WebContextMenuProxyMac::setupServicesMenu()
</span><span class="cx"> {
</span><span class="cx"> bool includeEditorServices = m_context.controlledDataIsEditable();
</span><span class="lines">@@ -385,6 +307,57 @@
</span><span class="cx"> showContextMenu();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+ }
+ }
+}
+
</ins><span class="cx"> void WebContextMenuProxyMac::showContextMenu()
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
</span><span class="lines">@@ -397,16 +370,15 @@
</span><span class="cx"> if (m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
</span><span class="cx"> useProposedItems = false;
</span><span class="cx">
</span><del>- const Vector<RefPtr<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
</del><ins>+ Vector<WebContextMenuItemData> items;
+ for (auto& item : (useProposedItems ? proposedAPIItems : clientItems))
+ items.append(item->data());
</ins><span class="cx">
</span><span class="cx"> if (items.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_menu = [[NSMenu alloc] initWithTitle:@""];
- [m_menu setAutoenablesItems:NO];
</del><ins>+ m_menu = createContextMenuFromItems(items);
</ins><span class="cx">
</span><del>- populateNSMenu(m_menu.get(), nsMenuItemVector(*this, items));
-
</del><span class="cx"> [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
</span><span class="cx"> [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>