<!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>[191517] trunk/Source/WebKit/mac</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/191517">191517</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-23 16:47:45 -0700 (Fri, 23 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>More context menu simplification
https://bugs.webkit.org/show_bug.cgi?id=150519
Reviewed by Tim Horton.
There's no need to convert the menu items back to ContextMenuItems just so we can check whether its
represented object is the sharing service picker. Also, move the check to the second loop.
* WebView/WebHTMLView.mm:
(-[WebHTMLView menuForEvent:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (191516 => 191517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-23 23:07:18 UTC (rev 191516)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-23 23:47:45 UTC (rev 191517)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-10-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ More context menu simplification
+ https://bugs.webkit.org/show_bug.cgi?id=150519
+
+ Reviewed by Tim Horton.
+
+ There's no need to convert the menu items back to ContextMenuItems just so we can check whether its
+ represented object is the sharing service picker. Also, move the check to the second loop.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView menuForEvent:]):
+
+2015-10-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Simplify the WebKitLegacy menu conversion code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150509
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (191516 => 191517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-10-23 23:07:18 UTC (rev 191516)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-10-23 23:47:45 UTC (rev 191517)
</span><span class="lines">@@ -3365,21 +3365,6 @@
</span><span class="cx"> if (!coreMenu)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- auto menuItemVector = contextMenuItemVector(coreMenu->platformDescription());
- for (auto& menuItem : menuItemVector) {
- if (menuItem.action() != ContextMenuItemTagShareMenu)
- continue;
-
- NSMenuItem *nsItem = menuItem.platformDescription();
- if (![nsItem.representedObject isKindOfClass:[NSSharingServicePicker class]]) {
- ASSERT_NOT_REACHED();
- continue;
- }
-#if ENABLE(SERVICE_CONTROLS)
- _private->currentSharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithSharingServicePicker:nsItem.representedObject client:static_cast<WebContextMenuClient&>(page->contextMenuController().client())]);
-#endif
- }
-
</del><span class="cx"> NSArray* menuItems = coreMenu->platformDescription();
</span><span class="cx"> if (!menuItems)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -3388,14 +3373,24 @@
</span><span class="cx"> if (!count)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- NSMenu* menu = [[[NSMenu alloc] init] autorelease];
- for (NSUInteger i = 0; i < count; i++)
- [menu addItem:[menuItems objectAtIndex:i]];
- setMenuTargets(menu);
</del><ins>+ auto menu = adoptNS([[NSMenu alloc] init]);
+
+ for (NSMenuItem *item in menuItems) {
+ [menu addItem:item];
+
+ if (item.tag == ContextMenuItemTagShareMenu) {
+ ASSERT([item.representedObject isKindOfClass:[NSSharingServicePicker class]]);
+#if ENABLE(SERVICE_CONTROLS)
+ _private->currentSharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithSharingServicePicker:item.representedObject client:static_cast<WebContextMenuClient&>(page->contextMenuController().client())]);
+#endif
+ }
+
+ }
+ setMenuTargets(menu.get());
</ins><span class="cx">
</span><span class="cx"> [[WebMenuTarget sharedMenuTarget] setMenuController:&page->contextMenuController()];
</span><span class="cx">
</span><del>- return menu;
</del><ins>+ return menu.autorelease();
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>