<!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>[191739] 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/191739">191739</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-29 11:30:43 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove a never used SPI delegate method
https://bugs.webkit.org/show_bug.cgi?id=150680
Reviewed by Beth Dakin.
The webView:contextMenuItemSelected:forElement: method was added 9 years ago, seemingly for feature parity with the Windows port.
The delegate method will never be called unless a menu item has the internal WebKit action/target pair, and a tag that
is set to >= ContextMenuItemBaseApplicationTag. Because of this, we can safely remove it.
* DefaultDelegates/WebDefaultUIDelegate.m:
(-[WebDefaultUIDelegate webView:willPopupMenu:]):
(-[WebDefaultUIDelegate webView:didDrawRect:]):
(-[WebDefaultUIDelegate webView:didScrollDocumentInFrameView:]):
(-[WebDefaultUIDelegate webView:contextMenuItemSelected:forElement:]): Deleted.
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::contextMenuItemSelected): Deleted.
* WebView/WebUIDelegatePrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem">trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.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 (191738 => 191739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-29 18:26:33 UTC (rev 191738)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-29 18:30:43 UTC (rev 191739)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-29 Anders Carlsson <andersca@apple.com>
+
+ Remove a never used SPI delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=150680
+
+ Reviewed by Beth Dakin.
+
+ The webView:contextMenuItemSelected:forElement: method was added 9 years ago, seemingly for feature parity with the Windows port.
+ The delegate method will never be called unless a menu item has the internal WebKit action/target pair, and a tag that
+ is set to >= ContextMenuItemBaseApplicationTag. Because of this, we can safely remove it.
+
+ * DefaultDelegates/WebDefaultUIDelegate.m:
+ (-[WebDefaultUIDelegate webView:willPopupMenu:]):
+ (-[WebDefaultUIDelegate webView:didDrawRect:]):
+ (-[WebDefaultUIDelegate webView:didScrollDocumentInFrameView:]):
+ (-[WebDefaultUIDelegate webView:contextMenuItemSelected:forElement:]): Deleted.
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::contextMenuItemSelected): Deleted.
+ * WebView/WebUIDelegatePrivate.h:
+
</ins><span class="cx"> 2015-10-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit, not WebCore, should do context menu conversion
</span></span></pre></div>
<a id="trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m (191738 => 191739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-10-29 18:26:33 UTC (rev 191738)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2015-10-29 18:30:43 UTC (rev 191739)
</span><span class="lines">@@ -242,6 +242,10 @@
</span><span class="cx"> - (void)webView:(WebView *)webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:(NSPoint)point withPasteboard:(NSPasteboard *)pasteboard
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+- (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu
+{
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didDrawRect:(NSRect)rect
</span><span class="lines">@@ -252,16 +256,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-- (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu
-{
-}
-
-- (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element
-{
-}
-#endif
-
</del><span class="cx"> - (void)webView:(WebView *)sender exceededApplicationCacheOriginQuotaForSecurityOrigin:(WebSecurityOrigin *)origin totalSpaceNeeded:(NSUInteger)totalSpaceNeeded
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (191738 => 191739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-29 18:26:33 UTC (rev 191738)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-29 18:30:43 UTC (rev 191739)
</span><span class="lines">@@ -91,15 +91,6 @@
</span><span class="cx">
</span><span class="cx"> void WebContextMenuClient::contextMenuItemSelected(ContextMenuItem* item, const ContextMenu* parentMenu)
</span><span class="cx"> {
</span><del>- id delegate = [m_webView UIDelegate];
- SEL selector = @selector(webView:contextMenuItemSelected:forElement:);
- if ([delegate respondsToSelector:selector]) {
- NSDictionary *element = [[WebElementDictionary alloc] initWithHitTestResult:[m_webView page]->contextMenuController().hitTestResult()];
-
- CallUIDelegate(m_webView, selector, item->platformDescription(), element);
-
- [element release];
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuClient::downloadURL(const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (191738 => 191739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-10-29 18:26:33 UTC (rev 191738)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-10-29 18:30:43 UTC (rev 191739)
</span><span class="lines">@@ -216,7 +216,6 @@
</span><span class="cx"> - (void)webView:(WebView *)sender didScrollDocumentInFrameView:(WebFrameView *)frameView;
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> - (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu;
</span><del>-- (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
</del><span class="cx"> - (void)webView:(WebView *)sender saveFrameView:(WebFrameView *)frameView showingPanel:(BOOL)showingPanel;
</span><span class="cx">
</span><span class="cx"> // FIXME: Rename this because it's only used by immediate action code.
</span></span></pre>
</div>
</div>
</body>
</html>