<!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>[175338] trunk/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/175338">175338</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 12:08:14 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename WebPageProxy::activeActionMenuHitTestResult to lastMouseMoveHitTestResult
https://bugs.webkit.org/show_bug.cgi?id=138137
<rdar://problem/18798257>
Reviewed by Anders Carlsson.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::mouseDidMoveOverElement):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::lastMouseMoveHitTestResult):
(WebKit::WebPageProxy::activeActionMenuHitTestResult): Deleted.
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItemsForLink]):
(-[WKActionMenuController _openURLFromActionMenu:]):
(-[WKActionMenuController _addToReadingListFromActionMenu:]):
(-[WKActionMenuController _quickLookURLFromActionMenu:]):
(-[WKActionMenuController _saveImageToDownloads:]):
(imageForResource:name::if):
(-[WKActionMenuController _updateActionMenuItems]):
Rename to the more accurate and general name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175337 => 175338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-29 19:01:27 UTC (rev 175337)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-29 19:08:14 UTC (rev 175338)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-10-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Rename WebPageProxy::activeActionMenuHitTestResult to lastMouseMoveHitTestResult
+ https://bugs.webkit.org/show_bug.cgi?id=138137
+ <rdar://problem/18798257>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::mouseDidMoveOverElement):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::lastMouseMoveHitTestResult):
+ (WebKit::WebPageProxy::activeActionMenuHitTestResult): Deleted.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForLink]):
+ (-[WKActionMenuController _openURLFromActionMenu:]):
+ (-[WKActionMenuController _addToReadingListFromActionMenu:]):
+ (-[WKActionMenuController _quickLookURLFromActionMenu:]):
+ (-[WKActionMenuController _saveImageToDownloads:]):
+ (imageForResource:name::if):
+ (-[WKActionMenuController _updateActionMenuItems]):
+ Rename to the more accurate and general name.
+
+2014-10-29 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Implement action menus for data detected items
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138178
</span><span class="cx"> <rdar://problem/18709436>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (175337 => 175338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-29 19:01:27 UTC (rev 175337)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-29 19:08:14 UTC (rev 175338)
</span><span class="lines">@@ -3111,7 +3111,7 @@
</span><span class="cx"> if (!decoder.decode(messageDecoder))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_activeActionMenuHitTestResult = WebHitTestResult::create(hitTestResultData);
</del><ins>+ m_lastMouseMoveHitTestResult = WebHitTestResult::create(hitTestResultData);
</ins><span class="cx">
</span><span class="cx"> WebEvent::Modifiers modifiers = static_cast<WebEvent::Modifiers>(opaqueModifiers);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (175337 => 175338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-29 19:01:27 UTC (rev 175337)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-29 19:08:14 UTC (rev 175338)
</span><span class="lines">@@ -922,7 +922,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void removeNavigationGestureSnapshot();
</span><span class="cx">
</span><del>- WebHitTestResult* activeActionMenuHitTestResult() const { return m_activeActionMenuHitTestResult.get(); }
</del><ins>+ WebHitTestResult* lastMouseMoveHitTestResult() const { return m_lastMouseMoveHitTestResult.get(); }
</ins><span class="cx"> void performActionMenuHitTestAtLocation(WebCore::FloatPoint);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1383,7 +1383,7 @@
</span><span class="cx"> RefPtr<WebContextMenuProxy> m_activeContextMenu;
</span><span class="cx"> ContextMenuContextData m_activeContextMenuContextData;
</span><span class="cx"> #endif
</span><del>- RefPtr<WebHitTestResult> m_activeActionMenuHitTestResult;
</del><ins>+ RefPtr<WebHitTestResult> m_lastMouseMoveHitTestResult;
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebOpenPanelResultListenerProxy> m_openPanelResultListener;
</span><span class="cx"> GeolocationPermissionRequestManagerProxy m_geolocationPermissionRequestManager;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175337 => 175338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 19:01:27 UTC (rev 175337)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-10-29 19:08:14 UTC (rev 175338)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItemsForLink
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult();
</del><ins>+ WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</ins><span class="cx"> if (!WebCore::protocolIsInHTTPFamily(hitTestResult->absoluteLinkURL()))
</span><span class="cx"> return @[ ];
</span><span class="cx">
</span><span class="lines">@@ -138,20 +138,20 @@
</span><span class="cx">
</span><span class="cx"> - (void)_openURLFromActionMenu:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult();
</del><ins>+ WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</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->activeActionMenuHitTestResult();
</del><ins>+ WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</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="cx">
</span><span class="cx"> - (void)_quickLookURLFromActionMenu:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult();
</del><ins>+ WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</ins><span class="cx"> NSRect itemFrame = [_wkView convertRect:hitTestResult->elementBoundingBox() toView:nil];
</span><span class="cx"> NSSize maximumPreviewSize = NSMakeSize(_wkView.bounds.size.width * 0.75, _wkView.bounds.size.height * 0.75);
</span><span class="cx">
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_saveImageToDownloads:(id)sender
</span><span class="cx"> {
</span><del>- WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult();
</del><ins>+ WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult();
</ins><span class="cx"> _page->process().context().download(_page, hitTestResult->absoluteImageURL());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_defaultMenuItems
</span><span class="cx"> {
</span><del>- if (WebHitTestResult* hitTestResult = _page->activeActionMenuHitTestResult()) {
</del><ins>+ if (WebHitTestResult* hitTestResult = _page->lastMouseMoveHitTestResult()) {
</ins><span class="cx"> if (!hitTestResult->absoluteImageURL().isEmpty() && _hitTestResult.image) {
</span><span class="cx"> _type = kWKActionMenuImage;
</span><span class="cx"> return [self _defaultMenuItemsForImage];
</span><span class="lines">@@ -418,9 +418,9 @@
</span><span class="cx">
</span><span class="cx"> NSArray *menuItems = [self _defaultMenuItems];
</span><span class="cx"> if ([_wkView respondsToSelector:@selector(_actionMenuItemsForHitTestResult:defaultActionMenuItems:)])
</span><del>- menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->activeActionMenuHitTestResult()) defaultActionMenuItems:menuItems];
</del><ins>+ menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->lastMouseMoveHitTestResult()) defaultActionMenuItems:menuItems];
</ins><span class="cx"> else
</span><del>- menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->activeActionMenuHitTestResult()) withType:_type defaultActionMenuItems:menuItems];
</del><ins>+ menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->lastMouseMoveHitTestResult()) withType:_type defaultActionMenuItems:menuItems];
</ins><span class="cx">
</span><span class="cx"> for (NSMenuItem *item in menuItems)
</span><span class="cx"> [_wkView.actionMenu addItem:item];
</span></span></pre>
</div>
</div>
</body>
</html>