<!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>[192384] 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/192384">192384</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-11-12 13:47:41 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove a couple of unused menu item tag enums
https://bugs.webkit.org/show_bug.cgi?id=151220
Reviewed by Sam Weinig.
Also, move the old internal tags away from the SPI header.
* WebView/WebHTMLView.mm:
(fixMenusReceivedFromOldClients):
* WebView/WebUIDelegatePrivate.h:</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>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192383 => 192384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-11-12 21:40:21 UTC (rev 192383)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-11-12 21:47:41 UTC (rev 192384)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-11-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove a couple of unused menu item tag enums
+ https://bugs.webkit.org/show_bug.cgi?id=151220
+
+ Reviewed by Sam Weinig.
+
+ Also, move the old internal tags away from the SPI header.
+
+ * WebView/WebHTMLView.mm:
+ (fixMenusReceivedFromOldClients):
+ * WebView/WebUIDelegatePrivate.h:
+
+2015-11-12 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> ContextMenuController::contextMenuItemSelected only needs the action and title, not the full item
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151217
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (192383 => 192384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-12 21:40:21 UTC (rev 192383)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-11-12 21:47:41 UTC (rev 192384)
</span><span class="lines">@@ -3494,6 +3494,13 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> } else if (preVersion3Client) {
</span><ins>+ enum {
+ // The next three values were used in WebKit 2.0 for SPI. In WebKit 3.0 these are API, with different values.
+ OldWebMenuItemTagSearchInSpotlight = 1000,
+ OldWebMenuItemTagSearchWeb,
+ OldWebMenuItemTagLookUpInDictionary,
+ };
+
</ins><span class="cx"> // Restore the new API tag for items on which we temporarily set the old SPI tag. The old SPI tag was
</span><span class="cx"> // needed to avoid confusing clients linked against earlier WebKits; the new API tag is needed for
</span><span class="cx"> // WebCore to handle the menu items appropriately (without needing to know about the old SPI tags).
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (192383 => 192384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-11-12 21:40:21 UTC (rev 192383)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-11-12 21:47:41 UTC (rev 192384)
</span><span class="lines">@@ -45,16 +45,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Mail on Tiger expects the old value for WebMenuItemTagSearchInGoogle
-#define WebMenuItemTagSearchInGoogle OldWebMenuItemTagSearchWeb
-
</del><span class="cx"> #define WEBMENUITEMTAG_WEBKIT_3_0_SPI_START 2000
</span><span class="cx"> enum {
</span><del>- // The next three values were used in WebKit 2.0 for SPI. In WebKit 3.0 these are API, with different values.
- OldWebMenuItemTagSearchInSpotlight = 1000,
- OldWebMenuItemTagSearchWeb,
- OldWebMenuItemTagLookUpInDictionary,
- // FIXME: These should move to WebUIDelegate.h as part of the WebMenuItemTag enum there, when we're not in API freeze
</del><ins>+ // FIXME: These should move to WebUIDelegate.h as part of the WebMenuItemTag enum there, when we're not in API freeze
</ins><span class="cx"> // Note that these values must be kept aligned with values in WebCore/ContextMenuItem.h
</span><span class="cx"> WebMenuItemTagOpenLink = WEBMENUITEMTAG_WEBKIT_3_0_SPI_START,
</span><span class="cx"> WebMenuItemTagIgnoreGrammar,
</span><span class="lines">@@ -106,10 +99,6 @@
</span><span class="cx"> WebMenuItemTagMediaPlayPause,
</span><span class="cx"> WebMenuItemTagMediaMute,
</span><span class="cx"> WebMenuItemTagDictationAlternative,
</span><del>- WebMenuItemBaseCustomTag = 5000,
- WebMenuItemCustomTagNoAction = 5998,
- WebMenuItemLastCustomTag = 5999,
- WebMenuItemTagBaseApplication = 10000
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Deprecated; remove when there are no more clients.
</span></span></pre>
</div>
</div>
</body>
</html>