<!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>[176107] 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/176107">176107</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-13 16:37:53 -0800 (Thu, 13 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK1: Clean up WebActionMenuController to use the _hitTestResult ivar
https://bugs.webkit.org/show_bug.cgi?id=138716
-and corresponding-
rdar://problem/18977222
Reviewed by Tim Horton.
It’s not necessary to use the WebElementDictionary for so many things now that we
are caching the HitTestResult. We should just use the HitTestResult.
* WebView/WebActionMenuController.mm:
(-[WebActionMenuController prepareForMenu:withEvent:]):
(-[WebActionMenuController _openURLFromActionMenu:]):
(-[WebActionMenuController _addToReadingListFromActionMenu:]):
(elementBoundingBoxFromNode):
(-[WebActionMenuController _quickLookURLFromActionMenu:]):
(-[WebActionMenuController _defaultMenuItemsForLink]):
(-[WebActionMenuController _defaultMenuItemsForImage]):
(-[WebActionMenuController _defaultMenuItemsForVideo]):
(-[WebActionMenuController _defaultMenuItemsForText]):
(-[WebActionMenuController _defaultMenuItemsForEditableText]):
(-[WebActionMenuController _defaultMenuItemsForEditableTextWithSuggestions]):
(-[WebActionMenuController _defaultMenuItemsForWhitespaceInEditableArea]):
(-[WebActionMenuController _createActionMenuItemForTag:]):
(-[WebActionMenuController _defaultMenuItems]):
(-[WebActionMenuController _elementBoundingBoxFromDOMElement:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForLink:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForImage:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForVideo:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForText:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForEditableText:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForEditableTextWithSuggestions:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForWhitespaceInEditableArea:]): Deleted.
(-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]): Deleted.
(-[WebActionMenuController _defaultMenuItemsForHitTestResult:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebActionMenuControllermm">trunk/Source/WebKit/mac/WebView/WebActionMenuController.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 (176106 => 176107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-14 00:36:33 UTC (rev 176106)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-14 00:37:53 UTC (rev 176107)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-11-13 Beth Dakin <bdakin@apple.com>
+
+ WK1: Clean up WebActionMenuController to use the _hitTestResult ivar
+ https://bugs.webkit.org/show_bug.cgi?id=138716
+ -and corresponding-
+ rdar://problem/18977222
+
+ Reviewed by Tim Horton.
+
+ It’s not necessary to use the WebElementDictionary for so many things now that we
+ are caching the HitTestResult. We should just use the HitTestResult.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController prepareForMenu:withEvent:]):
+ (-[WebActionMenuController _openURLFromActionMenu:]):
+ (-[WebActionMenuController _addToReadingListFromActionMenu:]):
+ (elementBoundingBoxFromNode):
+ (-[WebActionMenuController _quickLookURLFromActionMenu:]):
+ (-[WebActionMenuController _defaultMenuItemsForLink]):
+ (-[WebActionMenuController _defaultMenuItemsForImage]):
+ (-[WebActionMenuController _defaultMenuItemsForVideo]):
+ (-[WebActionMenuController _defaultMenuItemsForText]):
+ (-[WebActionMenuController _defaultMenuItemsForEditableText]):
+ (-[WebActionMenuController _defaultMenuItemsForEditableTextWithSuggestions]):
+ (-[WebActionMenuController _defaultMenuItemsForWhitespaceInEditableArea]):
+ (-[WebActionMenuController _createActionMenuItemForTag:]):
+ (-[WebActionMenuController _defaultMenuItems]):
+ (-[WebActionMenuController _elementBoundingBoxFromDOMElement:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForLink:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForImage:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForVideo:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForText:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForEditableText:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForEditableTextWithSuggestions:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForWhitespaceInEditableArea:]): Deleted.
+ (-[WebActionMenuController _createActionMenuItemForTag:withHitTestResult:]): Deleted.
+ (-[WebActionMenuController _defaultMenuItemsForHitTestResult:]): Deleted.
+
</ins><span class="cx"> 2014-11-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] NSGeometry data types are not available in the public SDK
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (176106 => 176107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-14 00:36:33 UTC (rev 176106)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-14 00:37:53 UTC (rev 176107)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> [actionMenu removeAllItems];
</span><span class="cx">
</span><span class="cx"> WebElementDictionary *hitTestResult = [self performHitTestAtPoint:event.locationInWindow];
</span><del>- NSArray *menuItems = [self _defaultMenuItemsForHitTestResult:hitTestResult];
</del><ins>+ NSArray *menuItems = [self _defaultMenuItems];
</ins><span class="cx">
</span><span class="cx"> // Allow clients to customize the menu items.
</span><span class="cx"> if ([[_webView UIDelegate] respondsToSelector:@selector(_webView:actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:)])
</span><span class="lines">@@ -181,13 +181,7 @@
</span><span class="cx"> if (!_webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSURL *url = [sender representedObject];
- if (!url)
- return;
-
- ASSERT([url isKindOfClass:[NSURL class]]);
-
- [[NSWorkspace sharedWorkspace] openURL:url];
</del><ins>+ [[NSWorkspace sharedWorkspace] openURL:_hitTestResult.absoluteLinkURL()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_addToReadingListFromActionMenu:(id)sender
</span><span class="lines">@@ -195,29 +189,23 @@
</span><span class="cx"> if (!_webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSURL *url = [sender representedObject];
- if (!url)
- return;
-
- ASSERT([url isKindOfClass:[NSURL class]]);
-
</del><ins>+ NSURL *url = _hitTestResult.absoluteLinkURL();
</ins><span class="cx"> NSSharingService *service = [NSSharingService sharingServiceNamed:NSSharingServiceNameAddToSafariReadingList];
</span><span class="cx"> [service performWithItems:@[ url ]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSRect)_elementBoundingBoxFromDOMElement:(DOMElement *)domElement
</del><ins>+static IntRect elementBoundingBoxFromNode(Node* node)
</ins><span class="cx"> {
</span><del>- if (!domElement)
- return NSZeroRect;
</del><ins>+ if (!node)
+ return IntRect();
</ins><span class="cx">
</span><del>- Node* node = core(domElement);
</del><span class="cx"> Frame* frame = node->document().frame();
</span><span class="cx"> if (!frame)
</span><del>- return NSZeroRect;
</del><ins>+ return IntRect();
</ins><span class="cx">
</span><span class="cx"> FrameView* view = frame->view();
</span><span class="cx"> if (!view)
</span><del>- return NSZeroRect;
</del><ins>+ return IntRect();
</ins><span class="cx">
</span><span class="cx"> return view->contentsToWindow(node->pixelSnappedBoundingBox());
</span><span class="cx"> }
</span><span class="lines">@@ -227,21 +215,15 @@
</span><span class="cx"> if (!_webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSDictionary *hitTestResult = [sender representedObject];
- if (!hitTestResult)
- return;
-
- ASSERT([hitTestResult isKindOfClass:[NSDictionary class]]);
-
- NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
</del><ins>+ NSURL *url = _hitTestResult.absoluteLinkURL();
</ins><span class="cx"> if (!url)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DOMElement *domElement = [hitTestResult objectForKey:WebElementDOMNodeKey];
- if (!domElement)
</del><ins>+ Node* node = _hitTestResult.innerNode();
+ if (!node)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- NSRect itemFrame = [_webView convertRect:[self _elementBoundingBoxFromDOMElement:domElement] toView:nil];
</del><ins>+ NSRect itemFrame = [_webView convertRect:elementBoundingBoxFromNode(node) toView:nil];
</ins><span class="cx"> NSSize maximumPreviewSize = NSMakeSize(_webView.bounds.size.width * 0.75, _webView.bounds.size.height * 0.75);
</span><span class="cx">
</span><span class="cx"> RetainPtr<QLPreviewBubble> bubble = adoptNS([[getQLPreviewBubbleClass() alloc] init]);
</span><span class="lines">@@ -257,40 +239,39 @@
</span><span class="cx"> [bubble showPreviewItem:url itemFrame:itemFrame];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForLink:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForLink
</ins><span class="cx"> {
</span><del>- NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
</del><ins>+ NSURL *url = _hitTestResult.absoluteLinkURL();
</ins><span class="cx"> if (!url)
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><span class="cx"> if (!WebCore::protocolIsInHTTPFamily([url absoluteString]))
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><del>- RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> previewLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPreviewLink withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> openLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagOpenLinkInDefaultBrowser];
+ RetainPtr<NSMenuItem> previewLinkItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPreviewLink];
+ RetainPtr<NSMenuItem> readingListItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddLinkToSafariReadingList];
</ins><span class="cx">
</span><span class="cx"> return @[ openLinkItem.get(), previewLinkItem.get(), [NSMenuItem separatorItem], readingListItem.get() ];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Image actions
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForImage:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForImage
</ins><span class="cx"> {
</span><del>- RetainPtr<NSMenuItem> copyImageItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyImage withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> copyImageItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyImage];
</ins><span class="cx">
</span><span class="cx"> RetainPtr<NSMenuItem> addToPhotosItem;
</span><span class="cx"> if ([self _canAddMediaToPhotos])
</span><del>- addToPhotosItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddImageToPhotos withHitTestResult:hitTestResult];
</del><ins>+ addToPhotosItem = [self _createActionMenuItemForTag:WebActionMenuItemTagAddImageToPhotos];
</ins><span class="cx"> else
</span><span class="cx"> addToPhotosItem = [NSMenuItem separatorItem];
</span><span class="cx">
</span><del>- RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagSaveImageToDownloads withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagSaveImageToDownloads];
</ins><span class="cx"> if (!_webView.downloadDelegate)
</span><span class="cx"> [saveToDownloadsItem setEnabled:NO];
</span><span class="cx">
</span><del>-
- RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareImage withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareImage];
</ins><span class="cx"> if (Image* image = _hitTestResult.image()) {
</span><span class="cx"> RetainPtr<CGImageRef> cgImage = image->getCGImageRef();
</span><span class="cx"> RetainPtr<NSImage> nsImage = adoptNS([[NSImage alloc] initWithCGImage:cgImage.get() size:NSZeroSize]);
</span><span class="lines">@@ -396,15 +377,15 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Video actions
</span><span class="cx">
</span><del>-- (NSArray*)_defaultMenuItemsForVideo:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray*)_defaultMenuItemsForVideo
</ins><span class="cx"> {
</span><del>- RetainPtr<NSMenuItem> copyVideoURLItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyVideoURL withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> copyVideoURLItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyVideoURL];
</ins><span class="cx">
</span><del>- RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagSaveVideoToDownloads withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> saveToDownloadsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagSaveVideoToDownloads];
</ins><span class="cx"> if (!_hitTestResult.isDownloadableMedia() || !_webView.downloadDelegate)
</span><span class="cx"> [saveToDownloadsItem setEnabled:NO];
</span><span class="cx">
</span><del>- RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareVideo withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> shareItem = [self _createActionMenuItemForTag:WebActionMenuItemTagShareVideo];
</ins><span class="cx"> NSString *urlToShare = _hitTestResult.absoluteMediaURL();
</span><span class="cx"> if (!_hitTestResult.isDownloadableMedia()) {
</span><span class="cx"> [saveToDownloadsItem setEnabled:NO];
</span><span class="lines">@@ -434,24 +415,24 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Text actions
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForText:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForText
</ins><span class="cx"> {
</span><del>- RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText];
+ RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText];
</ins><span class="cx">
</span><span class="cx"> return @[ copyTextItem.get(), lookupTextItem.get() ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForEditableText:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForEditableText
</ins><span class="cx"> {
</span><del>- RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText];
+ RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText];
+ RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste];
</ins><span class="cx">
</span><span class="cx"> return @[ copyTextItem.get(), lookupTextItem.get(), pasteItem.get() ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForEditableTextWithSuggestions:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForEditableTextWithSuggestions
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = core([_webView _selectedOrMainFrame]);
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -484,10 +465,10 @@
</span><span class="cx"> [spellingSubMenu addItem:item.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste withHitTestResult:hitTestResult];
- RetainPtr<NSMenuItem> textSuggestionsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagTextSuggestions withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText];
+ RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText];
+ RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste];
+ RetainPtr<NSMenuItem> textSuggestionsItem = [self _createActionMenuItemForTag:WebActionMenuItemTagTextSuggestions];
</ins><span class="cx">
</span><span class="cx"> [textSuggestionsItem setSubmenu:spellingSubMenu.get()];
</span><span class="cx">
</span><span class="lines">@@ -600,9 +581,9 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Whitespace actions
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForWhitespaceInEditableArea:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItemsForWhitespaceInEditableArea
</ins><span class="cx"> {
</span><del>- RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste withHitTestResult:hitTestResult];
</del><ins>+ RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste];
</ins><span class="cx">
</span><span class="cx"> return @[ [NSMenuItem separatorItem], [NSMenuItem separatorItem], pasteItem.get() ];
</span><span class="cx"> }
</span><span class="lines">@@ -636,33 +617,29 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Menu Items
</span><span class="cx">
</span><del>-- (RetainPtr<NSMenuItem>)_createActionMenuItemForTag:(uint32_t)tag withHitTestResult:(WebElementDictionary *)hitTestResult
</del><ins>+- (RetainPtr<NSMenuItem>)_createActionMenuItemForTag:(uint32_t)tag
</ins><span class="cx"> {
</span><span class="cx"> SEL selector = nullptr;
</span><span class="cx"> NSString *title = nil;
</span><span class="cx"> NSImage *image = nil;
</span><del>- id representedObject = nil;
</del><span class="cx">
</span><span class="cx"> switch (tag) {
</span><span class="cx"> case WebActionMenuItemTagOpenLinkInDefaultBrowser:
</span><span class="cx"> selector = @selector(_openURLFromActionMenu:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Open", "Open (action menu item)", "action menu item");
</span><span class="cx"> image = webKitBundleImageNamed(@"OpenInNewWindowTemplate");
</span><del>- representedObject = [hitTestResult objectForKey:WebElementLinkURLKey];
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagPreviewLink:
</span><span class="cx"> selector = @selector(_quickLookURLFromActionMenu:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Preview", "Preview (action menu item)", "action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuQuickLook"];
</span><del>- representedObject = hitTestResult;
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagAddLinkToSafariReadingList:
</span><span class="cx"> selector = @selector(_addToReadingListFromActionMenu:);
</span><span class="cx"> title = WEB_UI_STRING_KEY("Add to Reading List", "Add to Reading List (action menu item)", "action menu item");
</span><span class="cx"> image = [NSImage imageNamed:@"NSActionMenuAddToReadingList"];
</span><del>- representedObject = [hitTestResult objectForKey:WebElementLinkURLKey];
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebActionMenuItemTagCopyText:
</span><span class="lines">@@ -737,7 +714,6 @@
</span><span class="cx"> [item setImage:image];
</span><span class="cx"> [item setTarget:self];
</span><span class="cx"> [item setTag:tag];
</span><del>- [item setRepresentedObject:representedObject];
</del><span class="cx"> return item;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -746,44 +722,44 @@
</span><span class="cx"> return [[NSBundle bundleForClass:NSClassFromString(@"WKView")] imageForResource:name];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItemsForHitTestResult:(WebElementDictionary *)hitTestResult
</del><ins>+- (NSArray *)_defaultMenuItems
</ins><span class="cx"> {
</span><del>- NSURL *url = [hitTestResult objectForKey:WebElementLinkURLKey];
</del><ins>+ NSURL *url = _hitTestResult.absoluteLinkURL();
</ins><span class="cx"> if (url) {
</span><span class="cx"> _type = WebActionMenuLink;
</span><del>- return [self _defaultMenuItemsForLink:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForLink];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!_hitTestResult.absoluteMediaURL().isEmpty()) {
</span><span class="cx"> _type = WebActionMenuVideo;
</span><del>- return [self _defaultMenuItemsForVideo:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForVideo];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (_hitTestResult.image() && !_hitTestResult.absoluteImageURL().isEmpty()) {
</span><span class="cx"> _type = WebActionMenuImage;
</span><del>- return [self _defaultMenuItemsForImage:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForImage];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* node = _hitTestResult.innerNode();
</span><span class="cx"> if (node && node->isTextNode()) {
</span><span class="cx"> if (_hitTestResult.isContentEditable()) {
</span><del>- NSArray *editableTextWithSuggestions = [self _defaultMenuItemsForEditableTextWithSuggestions:hitTestResult];
</del><ins>+ NSArray *editableTextWithSuggestions = [self _defaultMenuItemsForEditableTextWithSuggestions];
</ins><span class="cx"> if (editableTextWithSuggestions.count) {
</span><span class="cx"> _type = WebActionMenuEditableTextWithSuggestions;
</span><span class="cx"> return editableTextWithSuggestions;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _type = WebActionMenuEditableText;
</span><del>- return [self _defaultMenuItemsForEditableText:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForEditableText];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _type = WebActionMenuReadOnlyText;
</span><del>- return [self _defaultMenuItemsForText:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForText];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (_hitTestResult.isContentEditable()) {
</span><span class="cx"> _type = WebActionMenuWhitespaceInEditableArea;
</span><del>- return [self _defaultMenuItemsForWhitespaceInEditableArea:hitTestResult];
</del><ins>+ return [self _defaultMenuItemsForWhitespaceInEditableArea];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _type = WebActionMenuNone;
</span></span></pre>
</div>
</div>
</body>
</html>