<!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>[175324] branches/safari-600.3-branch/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/175324">175324</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 01:54:22 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175229">r175229</a>. rdar://problem/18451638</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKitmacChangeLog">branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllerh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKitmacWebViewWebUIDelegatePrivateh">branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175323 => 175324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 08:51:59 UTC (rev 175323)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 08:54:22 UTC (rev 175324)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-10-29 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175229
+
+ 2014-10-27 Beth Dakin <bdakin@apple.com>
+
+ Provide a way for WebKit1 clients to override default action menu items
+ https://bugs.webkit.org/show_bug.cgi?id=138066
+ -and corresponding-
+ rdar://problem/18451638
+
+ Reviewed by Anders Carlsson.
+
+ WebActionMenuController now has an ivar for the WebActionMenuType so that it can
+ send that along to clients customizing the menu.
+ * WebView/WebActionMenuController.h:
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController prepareForMenu:withEvent:]):
+ (-[WebActionMenuController _defaultMenuItemsForHitTestResult:]):
+
+ New enum and new SPI to customize menus.
+ * WebView/WebUIDelegatePrivate.h:
+
+2014-10-29 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r175147
</span><span class="cx">
</span><span class="cx"> 2014-10-23 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h (175323 => 175324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h 2014-10-29 08:51:59 UTC (rev 175323)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.h 2014-10-29 08:54:22 UTC (rev 175324)
</span><span class="lines">@@ -23,11 +23,14 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import "WebUIDelegatePrivate.h"
+
</ins><span class="cx"> @class WebView;
</span><span class="cx">
</span><span class="cx"> @interface WebActionMenuController : NSObject {
</span><span class="cx"> @private
</span><span class="cx"> WebView *_webView;
</span><ins>+ WebActionMenuType _type;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithWebView:(WebView *)webView;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (175323 => 175324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-10-29 08:51:59 UTC (rev 175323)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-10-29 08:54:22 UTC (rev 175324)
</span><span class="lines">@@ -58,7 +58,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><ins>+
</ins><span class="cx"> _webView = webView;
</span><ins>+ _type = WebActionMenuNone;
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -81,9 +83,12 @@
</span><span class="cx">
</span><span class="cx"> NSDictionary *hitTestResult = [_webView elementAtPoint:[_webView convertPoint:event.locationInWindow fromView:nil]];
</span><span class="cx">
</span><del>- // FIXME: We should support API for clients to customize the menu items.
</del><span class="cx"> NSArray *menuItems = [self _defaultMenuItemsForHitTestResult:hitTestResult];
</span><span class="cx">
</span><ins>+ // Allow clients to customize the menu items.
+ if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:)])
+ menuItems = [[_webView UIDelegate] _webView:_webView actionMenuItemsForHitTestResult:hitTestResult withType:_type defaultActionMenuItems:menuItems];
+
</ins><span class="cx"> for (NSMenuItem *item in menuItems)
</span><span class="cx"> [actionMenu addItem:item];
</span><span class="cx"> }
</span><span class="lines">@@ -236,9 +241,13 @@
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForHitTestResult:(NSDictionary *)hitTestResult
</span><span class="cx"> {
</span><span class="cx"> NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
</span><del>- if (url)
</del><ins>+
+ if (url) {
+ _type = WebActionMenuLink;
</ins><span class="cx"> return [self _defaultMenuItemsForLink:hitTestResult];
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ _type = WebActionMenuNone;
</ins><span class="cx"> return @[ ];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (175323 => 175324)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-10-29 08:51:59 UTC (rev 175323)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-10-29 08:54:22 UTC (rev 175324)
</span><span class="lines">@@ -112,6 +112,18 @@
</span><span class="cx"> WebMenuItemTagBaseApplication = 10000
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum {
+ WebActionMenuItemTagNoAction = 0,
+ WebActionMenuItemTagOpenLinkInDefaultBrowser,
+ WebActionMenuItemTagPreviewLink,
+ WebActionMenuItemTagAddLinkToSafariReadingList
+};
+
+typedef enum {
+ WebActionMenuNone = 0,
+ WebActionMenuLink
+} WebActionMenuType;
+
</ins><span class="cx"> // Message Sources.
</span><span class="cx"> extern NSString *WebConsoleMessageXMLMessageSource;
</span><span class="cx"> extern NSString *WebConsoleMessageJSMessageSource;
</span><span class="lines">@@ -193,6 +205,7 @@
</span><span class="cx"> - (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu;
</span><span class="cx"> - (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
</span><span class="cx"> - (void)webView:(WebView *)sender saveFrameView:(WebFrameView *)frameView showingPanel:(BOOL)showingPanel;
</span><ins>+- (NSArray *)_webView:(WebView *)sender actionMenuItemsForHitTestResult:(NSDictionary *)hitTestResult withType:(WebActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems;
</ins><span class="cx"> #endif
</span><span class="cx"> - (BOOL)webView:(WebView *)sender didPressMissingPluginButton:(DOMElement *)element;
</span><span class="cx"> /*!
</span><span class="lines">@@ -269,11 +282,4 @@
</span><span class="cx">
</span><span class="cx"> - (NSData *)webCryptoMasterKeyForWebView:(WebView *)sender;
</span><span class="cx">
</span><del>-enum {
- WebActionMenuItemTagNoAction = 0,
- WebActionMenuItemTagOpenLinkInDefaultBrowser,
- WebActionMenuItemTagPreviewLink,
- WebActionMenuItemTagAddLinkToSafariReadingList
-};
-
</del><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>