<!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>[191131] 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/191131">191131</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 12:56:38 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>The menu location and menu items should be part of ContextMenuContextData
https://bugs.webkit.org/show_bug.cgi?id=150182
Reviewed by Andreas Kling.
* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
(WebKit::ContextMenuContextData::encode):
(WebKit::ContextMenuContextData::decode):
* Shared/ContextMenuContextData.h:
(WebKit::ContextMenuContextData::menuLocation):
(WebKit::ContextMenuContextData::menuItems):
(WebKit::ContextMenuContextData::ContextMenuContextData):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::showSelectionServiceMenu):
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::show):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatah">trunk/Source/WebKit2/Shared/ContextMenuContextData.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="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-10-15 Anders Carlsson <andersca@apple.com>
+
+ The menu location and menu items should be part of ContextMenuContextData
+ https://bugs.webkit.org/show_bug.cgi?id=150182
+
+ Reviewed by Andreas Kling.
+
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ (WebKit::ContextMenuContextData::encode):
+ (WebKit::ContextMenuContextData::decode):
+ * Shared/ContextMenuContextData.h:
+ (WebKit::ContextMenuContextData::menuLocation):
+ (WebKit::ContextMenuContextData::menuItems):
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::showContextMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::showSelectionServiceMenu):
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ (WebKit::WebContextMenu::show):
+
</ins><span class="cx"> 2015-10-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -44,8 +44,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
- : m_webHitTestResultData(context.hitTestResult(), true)
</del><ins>+ContextMenuContextData::ContextMenuContextData(const WebCore::IntPoint& menuLocation, const Vector<WebKit::WebContextMenuItemData>& menuItems, const ContextMenuContext& context)
+ : m_menuLocation(menuLocation)
+ , m_menuItems(menuItems)
+ , m_webHitTestResultData(context.hitTestResult(), true)
</ins><span class="cx"> , m_selectedText(context.selectedText())
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , m_selectionIsEditable(false)
</span><span class="lines">@@ -64,6 +66,8 @@
</span><span class="cx">
</span><span class="cx"> void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><ins>+ encoder << m_menuLocation;
+ encoder << m_menuItems;
</ins><span class="cx"> encoder << m_webHitTestResultData;
</span><span class="cx"> encoder << m_selectedText;
</span><span class="cx">
</span><span class="lines">@@ -75,21 +79,27 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& contextMenuContextData)
</del><ins>+bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& result)
</ins><span class="cx"> {
</span><del>- if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
</del><ins>+ if (!decoder.decode(result.m_menuLocation))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!decoder.decode(contextMenuContextData.m_selectedText))
</del><ins>+ if (!decoder.decode(result.m_menuItems))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.m_webHitTestResultData))
+ return false;
+
+ if (!decoder.decode(result.m_selectedText))
+ return false;
+
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!handle.isNull())
</span><del>- contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
</del><ins>+ result.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.h 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "ShareableBitmap.h"
</span><ins>+#include "WebContextMenuItemData.h"
</ins><span class="cx"> #include "WebHitTestResultData.h"
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="lines">@@ -46,14 +47,19 @@
</span><span class="cx"> class ContextMenuContextData {
</span><span class="cx"> public:
</span><span class="cx"> ContextMenuContextData();
</span><del>- ContextMenuContextData(const WebCore::ContextMenuContext&);
-
</del><ins>+ ContextMenuContextData(const WebCore::IntPoint& menuLocation, const Vector<WebKit::WebContextMenuItemData>& menuItems, const WebCore::ContextMenuContext&);
+
+ const WebCore::IntPoint& menuLocation() const { return m_menuLocation; }
+ const Vector<WebKit::WebContextMenuItemData>& menuItems() const { return m_menuItems; }
+
</ins><span class="cx"> const WebHitTestResultData& webHitTestResultData() const { return m_webHitTestResultData; }
</span><span class="cx"> const String& selectedText() const { return m_selectedText; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- ContextMenuContextData(const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
- : m_controlledSelectionData(selectionData)
</del><ins>+ ContextMenuContextData(const WebCore::IntPoint& menuLocation, const Vector<WebKit::WebContextMenuItemData>& menuItems, const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
+ : m_menuLocation(menuLocation)
+ , m_menuItems(menuItems)
+ , m_controlledSelectionData(selectionData)
</ins><span class="cx"> , m_selectedTelephoneNumbers(selectedTelephoneNumbers)
</span><span class="cx"> , m_selectionIsEditable(isEditable)
</span><span class="cx"> {
</span><span class="lines">@@ -71,6 +77,9 @@
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ WebCore::IntPoint m_menuLocation;
+ Vector<WebKit::WebContextMenuItemData> m_menuItems;
+
</ins><span class="cx"> WebHitTestResultData m_webHitTestResultData;
</span><span class="cx"> String m_selectedText;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -4182,18 +4182,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, const UserData& userData)
</del><ins>+void WebPageProxy::showContextMenu(const ContextMenuContextData& contextMenuContextData, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> // Showing a context menu runs a nested runloop, which can handle messages that cause |this| to get closed.
</span><span class="cx"> Ref<WebPageProxy> protect(*this);
</span><span class="cx">
</span><del>- internalShowContextMenu(menuLocation, contextMenuContextData, proposedItems, ContextMenuClientEligibility::EligibleForClient, userData);
</del><ins>+ internalShowContextMenu(contextMenuContextData, ContextMenuClientEligibility::EligibleForClient, userData);
</ins><span class="cx">
</span><span class="cx"> // No matter the result of internalShowContextMenu, always notify the WebProcess that the menu is hidden so it starts handling mouse events again.
</span><span class="cx"> m_process->send(Messages::WebPage::ContextMenuHidden(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, ContextMenuClientEligibility clientEligibility, const UserData& userData)
</del><ins>+void WebPageProxy::internalShowContextMenu(const ContextMenuContextData& contextMenuContextData, ContextMenuClientEligibility clientEligibility, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> m_activeContextMenuContextData = contextMenuContextData;
</span><span class="cx">
</span><span class="lines">@@ -4217,7 +4217,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
</span><del>- for (auto& item : proposedItems) {
</del><ins>+ for (auto& item : contextMenuContextData.menuItems()) {
</ins><span class="cx"> if (item.action() != ContextMenuItemTagShareMenu) {
</span><span class="cx"> proposedAPIItems.append(WebContextMenuItem::create(item));
</span><span class="cx"> continue;
</span><span class="lines">@@ -4235,8 +4235,8 @@
</span><span class="cx"> useProposedItems = false;
</span><span class="cx">
</span><span class="cx"> const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
</span><del>- if (!m_contextMenuClient->showContextMenu(*this, menuLocation, itemsToShow))
- m_activeContextMenu->showContextMenu(menuLocation, itemsToShow, contextMenuContextData);
</del><ins>+ if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
+ m_activeContextMenu->showContextMenu(contextMenuContextData.menuLocation(), itemsToShow, contextMenuContextData);
</ins><span class="cx">
</span><span class="cx"> m_contextMenuClient->contextMenuDismissed(*this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -1266,8 +1266,8 @@
</span><span class="cx"> EligibleForClient,
</span><span class="cx"> NotEligibleForClient
</span><span class="cx"> };
</span><del>- void showContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, const UserData&);
- void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, ContextMenuClientEligibility, const UserData&);
</del><ins>+ void showContextMenu(const ContextMenuContextData&, const UserData&);
+ void internalShowContextMenu(const ContextMenuContextData&, ContextMenuClientEligibility, const UserData&);
</ins><span class="cx"> WebCore::ContextMenuItem platformInitializeShareMenuItem(const ContextMenuContextData&);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> # ContextMenu messages
</span><del>- ShowContextMenu(WebCore::IntPoint menuLocation, WebKit::ContextMenuContextData contextMenuContextData, Vector<WebKit::WebContextMenuItemData> items, WebKit::UserData userData)
</del><ins>+ ShowContextMenu(WebKit::ContextMenuContextData contextMenuContextData, WebKit::UserData userData)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Authentication messages
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -688,9 +688,9 @@
</span><span class="cx"> void WebPageProxy::showSelectionServiceMenu(const IPC::DataReference& selectionAsRTFD, const Vector<String>& telephoneNumbers, bool isEditable, const IntPoint& point)
</span><span class="cx"> {
</span><span class="cx"> Vector<WebContextMenuItemData> items;
</span><del>- ContextMenuContextData contextData(selectionAsRTFD.vector(), telephoneNumbers, isEditable);
</del><ins>+ ContextMenuContextData contextData(point, items, selectionAsRTFD.vector(), telephoneNumbers, isEditable);
</ins><span class="cx">
</span><del>- internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, UserData());
</del><ins>+ internalShowContextMenu(contextData, ContextMenuClientEligibility::NotEligibleForClient, UserData());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (191130 => 191131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-10-15 19:54:02 UTC (rev 191130)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-10-15 19:56:38 UTC (rev 191131)
</span><span class="lines">@@ -63,11 +63,13 @@
</span><span class="cx"> Vector<WebContextMenuItemData> menuItems;
</span><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx"> menuItemsWithUserData(menuItems, userData);
</span><del>- ContextMenuContextData contextMenuContextData(controller.context());
</del><span class="cx">
</span><ins>+ auto menuLocation = view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame());
+ ContextMenuContextData contextMenuContextData(menuLocation, menuItems, controller.context());
+
</ins><span class="cx"> // Mark the WebPage has having a shown context menu then notify the UIProcess.
</span><span class="cx"> m_page->contextMenuShowing();
</span><del>- m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</del><ins>+ m_page->send(Messages::WebPageProxy::ShowContextMenu(contextMenuContextData, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
</span></span></pre>
</div>
</div>
</body>
</html>