<!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>[191401] 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/191401">191401</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-21 14:04:43 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using a popup menu button cell(!) for context menus
https://bugs.webkit.org/show_bug.cgi?id=150413
Reviewed by Tim Horton.
Just use a regular NSMenu. Also, have the service menu code path store the service menu
in the same member variable.
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):
(WebKit::WebContextMenuProxyMac::clearServicesMenu):
(WebKit::WebContextMenuProxyMac::populate):
(WebKit::WebContextMenuProxyMac::showContextMenu):
(WebKit::WebContextMenuProxyMac::hideContextMenu):
(WebKit::WebContextMenuProxyMac::cancelTracking):
(WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac): 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 (191400 => 191401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-21 20:22:31 UTC (rev 191400)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-21 21:04:43 UTC (rev 191401)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-21 Anders Carlsson <andersca@apple.com>
+
+ Stop using a popup menu button cell(!) for context menus
+ https://bugs.webkit.org/show_bug.cgi?id=150413
+
+ Reviewed by Tim Horton.
+
+ Just use a regular NSMenu. Also, have the service menu code path store the service menu
+ in the same member variable.
+
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+ (WebKit::WebContextMenuProxyMac::clearServicesMenu):
+ (WebKit::WebContextMenuProxyMac::populate):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ (WebKit::WebContextMenuProxyMac::hideContextMenu):
+ (WebKit::WebContextMenuProxyMac::cancelTracking):
+ (WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac): Deleted.
+
</ins><span class="cx"> 2015-10-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add assertions to NetworkCache::Entry constructor to make sure a key's type is "resource"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191400 => 191401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-21 20:22:31 UTC (rev 191400)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-21 21:04:43 UTC (rev 191401)
</span><span class="lines">@@ -74,10 +74,8 @@
</span><span class="cx"> WebCore::ContextMenuItem shareMenuItem();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RetainPtr<NSPopUpButtonCell> m_popup;
-#if ENABLE(SERVICE_CONTROLS)
- RetainPtr<NSMenu> m_servicesMenu;
-#endif
</del><ins>+ RetainPtr<NSMenu> m_menu;
+
</ins><span class="cx"> WKView* m_webView;
</span><span class="cx"> WebPageProxy& m_page;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191400 => 191401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-21 20:22:31 UTC (rev 191400)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-21 21:04:43 UTC (rev 191401)
</span><span class="lines">@@ -160,7 +160,6 @@
</span><span class="cx">
</span><span class="cx"> WebContextMenuProxyMac::~WebContextMenuProxyMac()
</span><span class="cx"> {
</span><del>- [m_popup setControlView:nil];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="lines">@@ -284,10 +283,10 @@
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:!includeEditorServices];
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:includeEditorServices];
</span><span class="cx">
</span><del>- m_servicesMenu = adoptNS([[picker menu] copy]);
</del><ins>+ m_menu = adoptNS([[picker menu] copy]);
</ins><span class="cx">
</span><span class="cx"> if (!hasControlledImage)
</span><del>- [m_servicesMenu setShowsStateColumn:YES];
</del><ins>+ [m_menu setShowsStateColumn:YES];
</ins><span class="cx">
</span><span class="cx"> // Explicitly add a menu item for each telephone number that is in the selection.
</span><span class="cx"> const Vector<String>& selectedTelephoneNumbers = context.selectedTelephoneNumbers();
</span><span class="lines">@@ -300,28 +299,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!telephoneNumberMenuItems.isEmpty()) {
</span><del>- if (m_servicesMenu)
- [m_servicesMenu insertItem:[NSMenuItem separatorItem] atIndex:0];
</del><ins>+ if (m_menu)
+ [m_menu insertItem:[NSMenuItem separatorItem] atIndex:0];
</ins><span class="cx"> else
</span><del>- m_servicesMenu = adoptNS([[NSMenu alloc] init]);
</del><ins>+ m_menu = adoptNS([[NSMenu alloc] init]);
</ins><span class="cx"> int itemPosition = 0;
</span><span class="cx"> NSMenuItem *groupEntry = [[NSMenuItem alloc] initWithTitle:menuItemTitleForTelephoneNumberGroup() action:nil keyEquivalent:@""];
</span><span class="cx"> [groupEntry setEnabled:NO];
</span><del>- [m_servicesMenu insertItem:groupEntry atIndex:itemPosition++];
</del><ins>+ [m_menu insertItem:groupEntry atIndex:itemPosition++];
</ins><span class="cx"> for (auto& menuItem : telephoneNumberMenuItems)
</span><del>- [m_servicesMenu insertItem:menuItem.get() atIndex:itemPosition++];
</del><ins>+ [m_menu insertItem:menuItem.get() atIndex:itemPosition++];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If there is no services menu, then the existing services on the system have changed, so refresh that list of services.
</span><span class="cx"> // If <rdar://problem/17954709> is resolved then we can more accurately keep the list up to date without this call.
</span><del>- if (!m_servicesMenu)
</del><ins>+ if (!m_menu)
</ins><span class="cx"> ServicesController::singleton().refreshExistingServices();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::clearServicesMenu()
</span><span class="cx"> {
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nullptr];
</span><del>- m_servicesMenu = nullptr;
</del><ins>+ m_menu = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContextMenuItem WebContextMenuProxyMac::shareMenuItem()
</span><span class="lines">@@ -369,17 +368,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_popup)
- [m_popup removeAllItems];
- else {
- m_popup = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
- [m_popup setUsesItemFromMenu:NO];
- [m_popup setAutoenablesItems:NO];
- [m_popup setAltersStateOfSelectedItem:NO];
- }
</del><ins>+ m_menu = [[NSMenu alloc] initWithTitle:@""];
+ [m_menu setAutoenablesItems:NO];
</ins><span class="cx">
</span><del>- NSMenu* menu = [m_popup menu];
- populateNSMenu(menu, nsMenuItemVector(items));
</del><ins>+ populateNSMenu(m_menu.get(), nsMenuItemVector(items));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::showContextMenu()
</span><span class="lines">@@ -425,62 +417,26 @@
</span><span class="cx">
</span><span class="cx"> [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
</span><span class="cx">
</span><del>- NSPoint menuLocation = m_context.menuLocation();
- NSRect menuRect = NSMakeRect(menuLocation.x, menuLocation.y, 0, 0);
-
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> if (m_context.isServicesMenu())
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
</span><del>-
- if (!m_servicesMenu)
- [m_popup attachPopUpWithFrame:menuRect inView:m_webView];
-
- NSMenu *menu = m_servicesMenu ? m_servicesMenu.get() : [m_popup menu];
-
- // Telephone number and service menus must use the [NSMenu popUpMenuPositioningItem:atLocation:inView:] API.
- // FIXME: That API is better than WKPopupContextMenu. In the future all menus should use either it
- // or the [NSMenu popUpContextMenu:withEvent:forView:] API, depending on the menu type.
- // Then we could get rid of NSPopUpButtonCell, custom metrics, and WKPopupContextMenu.
- if (m_context.isServicesMenu()) {
- [menu popUpMenuPositioningItem:nil atLocation:menuLocation inView:m_webView];
- hideContextMenu();
- return;
- }
-
-#else
- [m_popup attachPopUpWithFrame:menuRect inView:m_webView];
-
- NSMenu *menu = [m_popup menu];
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>- // These values were borrowed from AppKit to match their placement of the menu.
- NSRect titleFrame = [m_popup titleRectForBounds:menuRect];
- if (titleFrame.size.width <= 0 || titleFrame.size.height <= 0)
- titleFrame = menuRect;
- float vertOffset = roundf((NSMaxY(menuRect) - NSMaxY(titleFrame)) + NSHeight(titleFrame));
- NSPoint location = NSMakePoint(NSMinX(menuRect), NSMaxY(menuRect) - vertOffset);
-
- location = [m_webView convertPoint:location toView:nil];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- location = [m_webView.window convertBaseToScreen:location];
-#pragma clang diagnostic pop
-
</del><span class="cx"> Ref<WebContextMenuProxyMac> protect(*this);
</span><span class="cx">
</span><del>- WKPopupContextMenu(menu, location);
</del><ins>+ [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
</ins><span class="cx">
</span><span class="cx"> hideContextMenu();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::hideContextMenu()
</span><span class="cx"> {
</span><del>- [m_popup dismissPopUp];
</del><ins>+ [m_menu cancelTracking];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::cancelTracking()
</span><span class="cx"> {
</span><del>- [[m_popup menu] cancelTracking];
</del><ins>+ [m_menu cancelTracking];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSWindow *WebContextMenuProxyMac::window() const
</span></span></pre>
</div>
</div>
</body>
</html>