<!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>[191512] trunk</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/191512">191512</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-23 14:34:27 -0700 (Fri, 23 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the WebKitLegacy menu conversion code
https://bugs.webkit.org/show_bug.cgi?id=150509
Reviewed by Andreas Kling.
Source/WebKit/mac:
* WebCoreSupport/WebContextMenuClient.mm:
(fixMenusToSendToOldClients):
(fixMenusReceivedFromOldClients):
(WebContextMenuClient::getCustomMenuFromDefaultItems):
Tools:
Implement the context menu delegate method so we'll test that code path.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (191511 => 191512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-23 21:34:27 UTC (rev 191512)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-10-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Simplify the WebKitLegacy menu conversion code
+ https://bugs.webkit.org/show_bug.cgi?id=150509
+
+ Reviewed by Andreas Kling.
+
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (fixMenusToSendToOldClients):
+ (fixMenusReceivedFromOldClients):
+ (WebContextMenuClient::getCustomMenuFromDefaultItems):
+
+2015-10-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Don't override already existing represented objects on menu items
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150508
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (191511 => 191512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-23 21:34:27 UTC (rev 191512)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> return preInspectElementTagClient;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSMutableArray *fixMenusToSendToOldClients(NSMutableArray *defaultMenuItems)
</del><ins>+static RetainPtr<NSArray> fixMenusToSendToOldClients(NSMutableArray *defaultMenuItems)
</ins><span class="cx"> {
</span><del>- NSMutableArray *savedItems = nil;
</del><ins>+ auto savedItems = adoptNS([[NSMutableArray alloc] init]);
</ins><span class="cx">
</span><span class="cx"> unsigned defaultItemsCount = [defaultMenuItems count];
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> NSMenuItem *lastItem = [defaultMenuItems objectAtIndex:defaultItemsCount - 1];
</span><span class="cx">
</span><span class="cx"> if ([secondToLastItem isSeparatorItem] && [lastItem tag] == WebMenuItemTagInspectElement) {
</span><del>- savedItems = [NSMutableArray arrayWithCapacity:2];
</del><ins>+ savedItems = adoptNS([[NSMutableArray alloc] initWithCapacity:2]);
</ins><span class="cx"> [savedItems addObject:secondToLastItem];
</span><span class="cx"> [savedItems addObject:lastItem];
</span><span class="cx">
</span><span class="lines">@@ -125,10 +125,9 @@
</span><span class="cx"> BOOL preVersion3Client = isPreVersion3Client();
</span><span class="cx"> if (!preVersion3Client)
</span><span class="cx"> return savedItems;
</span><del>-
- for (unsigned i = 0; i < defaultItemsCount; ++i) {
- NSMenuItem *item = [defaultMenuItems objectAtIndex:i];
- int tag = [item tag];
</del><ins>+
+ for (NSMenuItem *item in defaultMenuItems) {
+ int tag = item.tag;
</ins><span class="cx"> int oldStyleTag = tag;
</span><span class="cx">
</span><span class="cx"> if (tag >= WEBMENUITEMTAG_WEBKIT_3_0_SPI_START) {
</span><span class="lines">@@ -158,21 +157,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (oldStyleTag != tag)
- [item setTag:oldStyleTag];
</del><ins>+ item.tag = oldStyleTag;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return savedItems;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fixMenusReceivedFromOldClients(NSMutableArray *newMenuItems, NSMutableArray *savedItems)
-{
</del><ins>+// FIXME: This should return NSArray.
+static RetainPtr<NSMutableArray> fixMenusReceivedFromOldClients(NSArray *delegateSuppliedItems, NSArray *savedItems)
+{
+ auto newMenuItems = adoptNS([delegateSuppliedItems mutableCopy]);
+
</ins><span class="cx"> if (savedItems)
</span><span class="cx"> [newMenuItems addObjectsFromArray:savedItems];
</span><span class="cx">
</span><span class="cx"> BOOL preVersion3Client = isPreVersion3Client();
</span><span class="cx"> if (!preVersion3Client)
</span><del>- return;
</del><ins>+ return newMenuItems;
</ins><span class="cx">
</span><span class="cx"> // Restore the modern tags to the menu items whose tags we altered in fixMenusToSendToOldClients.
</span><span class="cx"> unsigned newItemsCount = [newMenuItems count];
</span><span class="lines">@@ -285,6 +286,8 @@
</span><span class="cx"> if (modernTag != tag)
</span><span class="cx"> [item setTag:modernTag];
</span><span class="cx"> }
</span><ins>+
+ return newMenuItems;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
</span><span class="lines">@@ -312,12 +315,11 @@
</span><span class="cx"> menuItem.representedObject = element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSMutableArray *savedItems = [fixMenusToSendToOldClients(defaultMenuItems) retain];
</del><ins>+ auto savedItems = fixMenusToSendToOldClients(defaultMenuItems);
+
</ins><span class="cx"> NSArray *delegateSuppliedItems = CallUIDelegate(m_webView, selector, element, defaultMenuItems);
</span><del>- NSMutableArray *newMenuItems = [delegateSuppliedItems mutableCopy];
- fixMenusReceivedFromOldClients(newMenuItems, savedItems);
- [savedItems release];
- return [newMenuItems autorelease];
</del><ins>+
+ return fixMenusReceivedFromOldClients(delegateSuppliedItems, savedItems.get()).autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const ContextMenu* parentMenu)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191511 => 191512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Tools/ChangeLog 2015-10-23 21:34:27 UTC (rev 191512)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-23 Anders Carlsson <andersca@apple.com>
+
+ Simplify the WebKitLegacy menu conversion code
+ https://bugs.webkit.org/show_bug.cgi?id=150509
+
+ Reviewed by Andreas Kling.
+
+ Implement the context menu delegate method so we'll test that code path.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController webView:contextMenuItemsForElement:defaultMenuItems:]):
+
</ins><span class="cx"> 2015-10-23 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Improve test results for fast layouttests.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (191511 => 191512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-10-23 21:25:54 UTC (rev 191511)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-10-23 21:34:27 UTC (rev 191512)
</span><span class="lines">@@ -341,6 +341,11 @@
</span><span class="cx"> [self updateTitle:title];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
+{
+ return defaultMenuItems;
+}
+
</ins><span class="cx"> - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
</span><span class="cx"> {
</span><span class="cx"> NSAlert *alert = [[NSAlert alloc] init];
</span></span></pre>
</div>
</div>
</body>
</html>