<!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>[175444] 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/175444">175444</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 18:07:48 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add bundle SPI to customize the action menu
<rdar://problem/18830771>
https://bugs.webkit.org/show_bug.cgi?id=138271
Reviewed by Anders Carlsson.
- Adds a new function to the WKBundlePageContextMenuClient that allows the client to pass construct
user data in the bundle that can be available when customizing the menu in -[WKView _actionMenuItemsForHitTestResult...].
- Changes the signature of -[WKView _actionMenuItemsForHitTestResult...] to add userData.
- Makes the actual hit test result available in the second invocation of -[WKView _actionMenuItemsForHitTestResult...]
by serializing it in the ActionMenuHitTestResult.
* Shared/mac/ActionMenuHitTestResult.h:
* Shared/mac/ActionMenuHitTestResult.mm:
(WebKit::ActionMenuHitTestResult::encode):
(WebKit::ActionMenuHitTestResult::decode):
Adds the WebHitTestResult and the original hit test request location.
* UIProcess/API/Cocoa/WKViewPrivate.h:
Adds a new version of _actionMenuItemsForHitTestResult that passes userData along.
* UIProcess/API/mac/WKView.mm:
(-[WKView _didPerformActionMenuHitTest:userData:]):
(-[WKView _actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:userData:]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didPerformActionMenuHitTest):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::didPerformActionMenuHitTest):
Pipe the user data through to the WKView.
* UIProcess/mac/WKActionMenuController.h:
* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController prepareForMenu:withEvent:]):
(-[WKActionMenuController didPerformActionMenuHitTest:userData:]):
(-[WKActionMenuController menuNeedsUpdate:]):
(-[WKActionMenuController _updateActionMenuItemsForStage:]):
Differentiate between the two times _updateActionMenuItems was called via a new stage parameter,
(it is called once in prepareForMenu, and once in menuNeedsUpdate). Use the last mouse move hit
test result in the prepareForMenu case (as we don't have a real result yet), and the hit result
passed in via didPerformActionMenuHitTest in the menuNeedsUpdate case (assuming we didn't time out)
waiting on the web process.
* WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
(WebKit::InjectedBundlePageContextMenuClient::prepareForActionMenu):
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performActionMenuHitTestAtLocation):
Adds new bundle SPI to collect user data to pass to the -[WKView _actionMenuItemsForHitTestResult...] method.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacActionMenuHitTestResulth">trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacActionMenuHitTestResultmm">trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</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="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllerh">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKActionMenuControllermm">trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-10-31 Sam Weinig <sam@webkit.org>
+
+ Add bundle SPI to customize the action menu
+ <rdar://problem/18830771>
+ https://bugs.webkit.org/show_bug.cgi?id=138271
+
+ Reviewed by Anders Carlsson.
+
+ - Adds a new function to the WKBundlePageContextMenuClient that allows the client to pass construct
+ user data in the bundle that can be available when customizing the menu in -[WKView _actionMenuItemsForHitTestResult...].
+ - Changes the signature of -[WKView _actionMenuItemsForHitTestResult...] to add userData.
+ - Makes the actual hit test result available in the second invocation of -[WKView _actionMenuItemsForHitTestResult...]
+ by serializing it in the ActionMenuHitTestResult.
+
+ * Shared/mac/ActionMenuHitTestResult.h:
+ * Shared/mac/ActionMenuHitTestResult.mm:
+ (WebKit::ActionMenuHitTestResult::encode):
+ (WebKit::ActionMenuHitTestResult::decode):
+ Adds the WebHitTestResult and the original hit test request location.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ Adds a new version of _actionMenuItemsForHitTestResult that passes userData along.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _didPerformActionMenuHitTest:userData:]):
+ (-[WKView _actionMenuItemsForHitTestResult:withType:defaultActionMenuItems:userData:]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didPerformActionMenuHitTest):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::didPerformActionMenuHitTest):
+ Pipe the user data through to the WKView.
+
+ * UIProcess/mac/WKActionMenuController.h:
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController prepareForMenu:withEvent:]):
+ (-[WKActionMenuController didPerformActionMenuHitTest:userData:]):
+ (-[WKActionMenuController menuNeedsUpdate:]):
+ (-[WKActionMenuController _updateActionMenuItemsForStage:]):
+ Differentiate between the two times _updateActionMenuItems was called via a new stage parameter,
+ (it is called once in prepareForMenu, and once in menuNeedsUpdate). Use the last mouse move hit
+ test result in the prepareForMenu case (as we don't have a real result yet), and the hit result
+ passed in via didPerformActionMenuHitTest in the menuNeedsUpdate case (assuming we didn't time out)
+ waiting on the web process.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
+ (WebKit::InjectedBundlePageContextMenuClient::prepareForActionMenu):
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+ Adds new bundle SPI to collect user data to pass to the -[WKView _actionMenuItemsForHitTestResult...] method.
+
</ins><span class="cx"> 2014-10-31 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr for TypeCountSet
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacActionMenuHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define ActionMenuHitTestResult_h
</span><span class="cx">
</span><span class="cx"> #include "ShareableBitmap.h"
</span><ins>+#include "WebHitTestResult.h"
</ins><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS DDActionContext;
</span><span class="lines">@@ -42,6 +43,9 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, ActionMenuHitTestResult&);
</span><span class="cx">
</span><ins>+ WebCore::FloatPoint hitTestLocationInViewCooordinates;
+ WebHitTestResult::Data hitTestResult;
+
</ins><span class="cx"> RefPtr<ShareableBitmap> image;
</span><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> actionContext;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacActionMenuHitTestResultmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/Shared/mac/ActionMenuHitTestResult.mm 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -36,6 +36,9 @@
</span><span class="cx">
</span><span class="cx"> void ActionMenuHitTestResult::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><ins>+ encoder << hitTestLocationInViewCooordinates;
+ encoder << hitTestResult;
+
</ins><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should consider sharing the raw original resource data so that metadata and whatnot are preserved.
</span><span class="lines">@@ -61,6 +64,12 @@
</span><span class="cx">
</span><span class="cx"> bool ActionMenuHitTestResult::decode(IPC::ArgumentDecoder& decoder, ActionMenuHitTestResult& actionMenuHitTestResult)
</span><span class="cx"> {
</span><ins>+ if (!decoder.decode(actionMenuHitTestResult.hitTestLocationInViewCooordinates))
+ return false;
+
+ if (!decoder.decode(actionMenuHitTestResult.hitTestResult))
+ return false;
+
</ins><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> - (void)_setDidMoveSwipeSnapshotCallback:(void(^)(CGRect swipeSnapshotRectInWindowCoordinates))callback;
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems;
</span><del>-
</del><ins>+- (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems userData:(WKTypeRef)userData;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -3658,9 +3658,9 @@
</span><span class="cx"> [_data->_actionMenuController didCloseMenu:menu withEvent:event];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult
</del><ins>+- (void)_didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData
</ins><span class="cx"> {
</span><del>- [_data->_actionMenuController didPerformActionMenuHitTest:hitTestResult];
</del><ins>+ [_data->_actionMenuController didPerformActionMenuHitTest:hitTestResult userData:userData];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="lines">@@ -4138,6 +4138,11 @@
</span><span class="cx"> return defaultMenuItems;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)_actionMenuItemsForHitTestResult:(WKHitTestResultRef)hitTestResult withType:(_WKActionMenuType)type defaultActionMenuItems:(NSArray *)defaultMenuItems userData:(WKTypeRef)userData
+{
+ return [self _actionMenuItemsForHitTestResult:hitTestResult withType:type defaultActionMenuItems:defaultMenuItems];
+}
+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx">
</span><span class="cx"> - (void)_setAutomaticallyAdjustsContentInsets:(BOOL)automaticallyAdjustsContentInsets
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> - (void)_closeFullScreenWindowController;
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>-- (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult;
</del><ins>+- (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&) = 0;
</del><ins>+ virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, API::Object*) = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -5279,9 +5279,14 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SelectLookupTextAtLocation(point), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result)
</del><ins>+void WebPageProxy::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, IPC::MessageDecoder& decoder)
</ins><span class="cx"> {
</span><del>- m_pageClient.didPerformActionMenuHitTest(result);
</del><ins>+ RefPtr<API::Object> userData;
+ WebContextUserMessageDecoder messageDecoder(userData, process());
+ if (!decoder.decode(messageDecoder))
+ return;
+
+ m_pageClient.didPerformActionMenuHitTest(result, userData.get());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -1313,7 +1313,7 @@
</span><span class="cx"> void viewDidEnterWindow();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- void didPerformActionMenuHitTest(const ActionMenuHitTestResult&);
</del><ins>+ void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, IPC::MessageDecoder&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> PageClient& m_pageClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -411,6 +411,6 @@
</span><span class="cx"> IsPlayingAudioDidChange(bool newIsPlayingAudio)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- DidPerformActionMenuHitTest(WebKit::ActionMenuHitTestResult result)
</del><ins>+ DidPerformActionMenuHitTest(WebKit::ActionMenuHitTestResult result, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) override;
</span><span class="cx"> virtual void removeNavigationGestureSnapshot() override;
</span><span class="cx">
</span><del>- virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&) override;
</del><ins>+ virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, API::Object*) override;
</ins><span class="cx">
</span><span class="cx"> WKView *m_wkView;
</span><span class="cx"> WKWebView *m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -753,10 +753,10 @@
</span><span class="cx"> return [windowContentLayer convertRect:layer.bounds fromLayer:layer];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageClientImpl::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result)
</del><ins>+void PageClientImpl::didPerformActionMenuHitTest(const ActionMenuHitTestResult& result, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>- [m_wkView _didPerformActionMenuHitTest:result];
</del><ins>+ [m_wkView _didPerformActionMenuHitTest:result userData:userData];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> WebKit::ActionMenuState _state;
</span><span class="cx"> WebKit::ActionMenuHitTestResult _hitTestResult;
</span><ins>+ RefPtr<API::Object> _userData;
</ins><span class="cx"> _WKActionMenuType _type;
</span><span class="cx"> RetainPtr<NSSharingServicePicker> _sharingServicePicker;
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
</span><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event;
</span><span class="cx">
</span><del>-- (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult;
</del><ins>+- (void)didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -46,6 +46,11 @@
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/URL.h>
</span><span class="cx">
</span><ins>+enum class MenuUpdateStage {
+ PrepareForMenu,
+ MenuNeedsUpdate
+};
+
</ins><span class="cx"> // FIXME: This should move into an SPI header if it stays.
</span><span class="cx"> @class QLPreviewBubble;
</span><span class="cx"> @interface NSObject (WKQLPreviewBubbleDetails)
</span><span class="lines">@@ -64,7 +69,7 @@
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> @interface WKActionMenuController () <NSSharingServiceDelegate, NSSharingServicePickerDelegate>
</span><del>-- (void)_updateActionMenuItems;
</del><ins>+- (void)_updateActionMenuItemsForStage:(MenuUpdateStage)stage;
</ins><span class="cx"> - (BOOL)_canAddImageToPhotos;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -102,7 +107,7 @@
</span><span class="cx"> _page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);
</span><span class="cx">
</span><span class="cx"> _state = ActionMenuState::Pending;
</span><del>- [self _updateActionMenuItems];
</del><ins>+ [self _updateActionMenuItemsForStage:MenuUpdateStage::PrepareForMenu];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="lines">@@ -131,11 +136,12 @@
</span><span class="cx"> _sharingServicePicker = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult
</del><ins>+- (void)didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This needs to use the WebKit2 callback mechanism to avoid out-of-order replies.
</span><span class="cx"> _state = ActionMenuState::Ready;
</span><span class="cx"> _hitTestResult = hitTestResult;
</span><ins>+ _userData = userData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Link actions
</span><span class="lines">@@ -342,7 +348,7 @@
</span><span class="cx"> connection->waitForAndDispatchImmediately<Messages::WebPageProxy::DidPerformActionMenuHitTest>(_page->pageID(), std::chrono::milliseconds(500));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [self _updateActionMenuItems];
</del><ins>+ [self _updateActionMenuItemsForStage:MenuUpdateStage::MenuNeedsUpdate];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSSharingServicePickerDelegate implementation
</span><span class="lines">@@ -484,15 +490,28 @@
</span><span class="cx"> return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_updateActionMenuItems
</del><ins>+- (void)_updateActionMenuItemsForStage:(MenuUpdateStage)stage
</ins><span class="cx"> {
</span><span class="cx"> [_wkView.actionMenu removeAllItems];
</span><span class="cx">
</span><span class="cx"> NSArray *menuItems = [self _defaultMenuItems];
</span><ins>+ RefPtr<WebHitTestResult> hitTestResult;
+ switch (stage) {
+ case MenuUpdateStage::PrepareForMenu:
+ hitTestResult = _page->lastMouseMoveHitTestResult();
+ break;
+ case MenuUpdateStage::MenuNeedsUpdate:
+ if (_state == ActionMenuState::Ready)
+ hitTestResult = WebHitTestResult::create(_hitTestResult.hitTestResult);
+ else
+ hitTestResult = _page->lastMouseMoveHitTestResult();
+ break;
+ }
+
</ins><span class="cx"> if ([_wkView respondsToSelector:@selector(_actionMenuItemsForHitTestResult:defaultActionMenuItems:)])
</span><del>- menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->lastMouseMoveHitTestResult()) defaultActionMenuItems:menuItems];
</del><ins>+ menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(hitTestResult.get()) defaultActionMenuItems:menuItems];
</ins><span class="cx"> else
</span><del>- menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(_page->lastMouseMoveHitTestResult()) withType:_type defaultActionMenuItems:menuItems];
</del><ins>+ menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(hitTestResult.get()) withType:_type defaultActionMenuItems:menuItems userData:toAPI(_userData.get())];
</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>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageGetContextMenuFromDefaultContextMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKArrayRef defaultMenu, WKArrayRef* newMenu, WKTypeRef* userData, const void* clientInfo);
</span><ins>+typedef void (*WKBundlePagePrepareForActionMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKTypeRef* userData, const void* clientInfo);
</ins><span class="cx">
</span><span class="cx"> typedef struct WKBundlePageContextMenuClientBase {
</span><span class="cx"> int version;
</span><span class="lines">@@ -38,10 +39,16 @@
</span><span class="cx"> typedef struct WKBundlePageContextMenuClientV0 {
</span><span class="cx"> WKBundlePageContextMenuClientBase base;
</span><span class="cx">
</span><del>- // Version 0.
</del><span class="cx"> WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
</span><span class="cx"> } WKBundlePageContextMenuClientV0;
</span><span class="cx">
</span><ins>+typedef struct WKBundlePageContextMenuClientV1 {
+ WKBundlePageContextMenuClientBase base;
+
+ WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
+ WKBundlePagePrepareForActionMenuCallback prepareForActionMenu;
+} WKBundlePageContextMenuClientV1;
+
</ins><span class="cx"> enum { kWKBundlePageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</span><span class="cx"> typedef struct WKBundlePageContextMenuClient {
</span><span class="cx"> int version;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -76,5 +76,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InjectedBundlePageContextMenuClient::prepareForActionMenu(WebPage* page, InjectedBundleHitTestResult* hitTestResult, RefPtr<API::Object>& userData)
+{
+ if (!m_client.prepareForActionMenu)
+ return;
+
+ WKTypeRef userDataToPass = nullptr;
+ m_client.prepareForActionMenu(toAPI(page), toAPI(hitTestResult), &userDataToPass, m_client.base.clientInfo);
+ userData = adoptRef(toImpl(userDataToPass));
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class Object;
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKBundlePageContextMenuClientBase> {
</span><del>- typedef std::tuple<WKBundlePageContextMenuClientV0> Versions;
</del><ins>+ typedef std::tuple<WKBundlePageContextMenuClientV0, WKBundlePageContextMenuClientV1> Versions;
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> class InjectedBundlePageContextMenuClient : public API::Client<WKBundlePageContextMenuClientBase> {
</span><span class="cx"> public:
</span><span class="cx"> bool getCustomMenuFromDefaultItems(WebPage*, InjectedBundleHitTestResult*, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData);
</span><ins>+ void prepareForActionMenu(WebPage*, InjectedBundleHitTestResult*, RefPtr<API::Object>& userData);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175443 => 175444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-01 00:26:36 UTC (rev 175443)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-01 01:07:48 UTC (rev 175444)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> #import "DictionaryPopupInfo.h"
</span><span class="cx"> #import "EditingRange.h"
</span><span class="cx"> #import "EditorState.h"
</span><ins>+#import "InjectedBundleHitTestResult.h"
+#import "InjectedBundleUserMessageCoders.h"
</ins><span class="cx"> #import "PDFKitImports.h"
</span><span class="cx"> #import "PageBanner.h"
</span><span class="cx"> #import "PluginView.h"
</span><span class="lines">@@ -1134,7 +1136,7 @@
</span><span class="cx">
</span><span class="cx"> MainFrame& mainFrame = corePage()->mainFrame();
</span><span class="cx"> if (!mainFrame.view() || !mainFrame.view()->renderView()) {
</span><del>- send(Messages::WebPageProxy::DidPerformActionMenuHitTest(ActionMenuHitTestResult()));
</del><ins>+ send(Messages::WebPageProxy::DidPerformActionMenuHitTest(ActionMenuHitTestResult(), InjectedBundleUserMessageEncoder(nullptr)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1147,6 +1149,8 @@
</span><span class="cx"> mainRenderView.hitTest(request, hitTestResult);
</span><span class="cx">
</span><span class="cx"> ActionMenuHitTestResult actionMenuResult;
</span><ins>+ actionMenuResult.hitTestLocationInViewCooordinates = locationInViewCooordinates;
+ actionMenuResult.hitTestResult = WebHitTestResult::Data(hitTestResult);
</ins><span class="cx">
</span><span class="cx"> if (Image* image = hitTestResult.image()) {
</span><span class="cx"> actionMenuResult.image = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
</span><span class="lines">@@ -1160,8 +1164,12 @@
</span><span class="cx"> actionMenuResult.actionContext = scanForDataDetectedItems(hitTestResult, actionBoundingBox);
</span><span class="cx"> actionMenuResult.actionBoundingBox = actionBoundingBox;
</span><span class="cx"> }
</span><del>-
- send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult));
</del><ins>+
+ RefPtr<API::Object> userData;
+ RefPtr<InjectedBundleHitTestResult> injectedBundleHitTestResult = InjectedBundleHitTestResult::create(hitTestResult);
+ injectedBundleContextMenuClient().prepareForActionMenu(this, injectedBundleHitTestResult.get(), userData);
+
+ send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, InjectedBundleUserMessageEncoder(userData.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::selectLookupTextAtLocation(FloatPoint locationInWindowCooordinates)
</span></span></pre>
</div>
</div>
</body>
</html>