<!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>[175865] branches/safari-600.3-branch/Source/WebKit2</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/175865">175865</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 00:49:13 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175780">r175780</a>. rdar://problems/18919195</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175864 => 175865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 08:49:10 UTC (rev 175864)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 08:49:13 UTC (rev 175865)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-11-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175780. <rdar://problem/18919195>
+
+ 2014-11-08 Beth Dakin <bdakin@apple.com>
+
+ WKActionMenuController methods should be more careful to use the best
+ WebHitTestResult
+ https://bugs.webkit.org/show_bug.cgi?id=138536
+ -and corresponding-
+ rdar://problem/18919195
+
+ Reviewed by Tim Horton.
+
+ This patch re-names _hitTestResultForStage to _webHitTestResult. The method no
+ longer takes a stage since that value is really not necessary to determine the
+ correct WebHitTestResult. This patch also makes all spots in this file that access
+ a WebHitTestResult go through _webHitTestResult to ensure that they get the most
+ up-to-date option.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController willOpenMenu:withEvent:]):
+ (-[WKActionMenuController _openURLFromActionMenu:]):
+ (-[WKActionMenuController _addToReadingListFromActionMenu:]):
+ (-[WKActionMenuController _previewURLFromActionMenu:]):
+ (-[WKActionMenuController _defaultMenuItemsForVideo]):
+ (-[WKActionMenuController _copyVideoURL:]):
+ (-[WKActionMenuController _saveVideoToDownloads:]):
+ (-[WKActionMenuController _saveImageToDownloads:]):
+ (-[WKActionMenuController _defaultMenuItems]):
+ (-[WKActionMenuController _updateActionMenuItemsForStage:]):
+ (imageForResource:name::switch): Deleted.
+ (-[WKActionMenuController _defaultMenuItems:]): Deleted.
+
+
+2014-11-11 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r175779. <rdar://problem/18742164>
</span><span class="cx">
</span><span class="cx"> 2014-11-08 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175864 => 175865)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 08:49:10 UTC (rev 175864)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-11 08:49:13 UTC (rev 175865)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> // Action menus for text should highlight the text so that it is clear what the action menu actions
</span><span class="cx"> // will apply to. If the text is already selected, the menu will use the existing selection.
</span><del>- RefPtr<WebHitTestResult> hitTestResult = [self _hitTestResultForStage:MenuUpdateStage::MenuNeedsUpdate];
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> if (!hitTestResult->isSelected())
</span><span class="cx"> _page->selectLastActionMenuRange();
</span><span class="cx"> }
</span><span class="lines">@@ -289,13 +289,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)_openURLFromActionMenu:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> [[NSWorkspace sharedWorkspace] openURL:[NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()]];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_addToReadingListFromActionMenu:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> NSSharingService *service = [NSSharingService sharingServiceNamed:NSSharingServiceNameAddToSafariReadingList];
</span><span class="cx"> [service performWithItems:@[ [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()] ]];
</span><span class="cx"> }
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> if (_previewPopover)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> NSURL *url = [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
</span><span class="cx"> NSRect originRect = hitTestResult->elementBoundingBox();
</span><span class="cx"> [self _createPreviewPopoverForURL:url originRect:originRect];
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> RetainPtr<NSMenuItem> copyVideoURLItem = [self _createActionMenuItemForTag:kWKContextActionItemTagCopyVideoURL];
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMenuItem> saveToDownloadsItem;
</span><del>- RefPtr<WebHitTestResult> hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> if (hitTestResult->isDownloadableMedia())
</span><span class="cx"> saveToDownloadsItem = [self _createActionMenuItemForTag:kWKContextActionItemTagSaveVideoToDownloads];
</span><span class="cx"> else
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_copyVideoURL:(id)sender
</span><span class="cx"> {
</span><del>- RefPtr<WebHitTestResult> hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx">
</span><span class="cx"> [[NSPasteboard generalPasteboard] clearContents];
</span><span class="cx"> [[NSPasteboard generalPasteboard] writeObjects:@[ hitTestResult->absoluteMediaURL() ]];
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_saveVideoToDownloads:(id)sender
</span><span class="cx"> {
</span><del>- RefPtr<WebHitTestResult> hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> _page->process().context().download(_page, hitTestResult->absoluteMediaURL());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_saveImageToDownloads:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> _page->process().context().download(_page, hitTestResult->absoluteImageURL());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -825,27 +825,20 @@
</span><span class="cx"> return [[NSBundle bundleForClass:[WKView class]] imageForResource:name];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (PassRefPtr<WebHitTestResult>)_hitTestResultForStage:(MenuUpdateStage)stage
</del><ins>+- (PassRefPtr<WebHitTestResult>)_webHitTestResult
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult;
</span><del>- switch (stage) {
- case MenuUpdateStage::PrepareForMenu:
</del><ins>+ if (_state == ActionMenuState::Ready)
+ hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
+ else
</ins><span class="cx"> hitTestResult = _page->lastMouseMoveHitTestResult();
</span><del>- break;
- case MenuUpdateStage::MenuNeedsUpdate:
- if (_state == ActionMenuState::Ready)
- hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
- else
- hitTestResult = _page->lastMouseMoveHitTestResult();
- break;
- }
</del><span class="cx">
</span><span class="cx"> return hitTestResult.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)_defaultMenuItems:(MenuUpdateStage)stage
</del><ins>+- (NSArray *)_defaultMenuItems
</ins><span class="cx"> {
</span><del>- RefPtr<WebHitTestResult> hitTestResult = [self _hitTestResultForStage:stage];
</del><ins>+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx"> if (!hitTestResult) {
</span><span class="cx"> _type = kWKActionMenuNone;
</span><span class="cx"> return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
</span><span class="lines">@@ -902,8 +895,8 @@
</span><span class="cx"> {
</span><span class="cx"> [_wkView.actionMenu removeAllItems];
</span><span class="cx">
</span><del>- NSArray *menuItems = [self _defaultMenuItems:stage];
- RefPtr<WebHitTestResult> hitTestResult = [self _hitTestResultForStage:stage];
</del><ins>+ NSArray *menuItems = [self _defaultMenuItems];
+ RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</ins><span class="cx">
</span><span class="cx"> if ([_wkView respondsToSelector:@selector(_actionMenuItemsForHitTestResult:defaultActionMenuItems:)])
</span><span class="cx"> menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(hitTestResult.get()) defaultActionMenuItems:menuItems];
</span></span></pre>
</div>
</div>
</body>
</html>