<!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>[178889] 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/178889">178889</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-21 23:53:01 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API::ContextMenuClient and API::InjectedBundle::PageContextMenuClient classes
https://bugs.webkit.org/show_bug.cgi?id=138466
Reviewed by Anders Carlsson.
Move ContextMenuClient to use API classes in both UI and Injected
Bundle APIs.
* CMakeLists.txt: Remove WebPageContextMenuClient.cpp.
* UIProcess/API/APIContextMenuClient.h: Renamed from Source/WebKit2/UIProcess/WebPageContextMenuClient.h.
(API::ContextMenuClient::~ContextMenuClient):
(API::ContextMenuClient::getContextMenuFromProposedMenu):
(API::ContextMenuClient::customContextMenuItemSelected):
(API::ContextMenuClient::contextMenuDismissed):
(API::ContextMenuClient::showContextMenu):
(API::ContextMenuClient::hideContextMenu):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageContextMenuClient):
* UIProcess/WebPageContextMenuClient.cpp: Removed.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setContextMenuClient):
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::contextMenuItemSelected):
(WebKit::WebPageProxy::initializeContextMenuClient): Deleted.
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj: Remove deleted files and add
new files to compilation.
* WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h: Copied from Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h.
(API::InjectedBundle::PageContextMenuClient::~PageContextMenuClient):
(API::InjectedBundle::PageContextMenuClient::getCustomMenuFromDefaultItems):
(API::InjectedBundle::PageContextMenuClient::prepareForActionMenu):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetContextMenuClient):
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
(WebKit::InjectedBundlePageContextMenuClient::InjectedBundlePageContextMenuClient):
(WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
(WebKit::InjectedBundlePageContextMenuClient::prepareForActionMenu):
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
* WebProcess/WebPage/WebContextMenu.cpp:
(WebKit::WebContextMenu::menuItemsWithUserData):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::setInjectedBundleContextMenuClient):
(WebKit::WebPage::close):
(WebKit::WebPage::initializeInjectedBundleContextMenuClient): Deleted.
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::injectedBundleContextMenuClient):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::performActionMenuHitTestAtLocation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</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="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIContextMenuClienth">trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageContextMenuClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebPageContextMenuClientcpp">trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageContextMenuClienth">trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -349,7 +349,6 @@
</span><span class="cx"> UIProcess/WebMediaCacheManagerProxy.cpp
</span><span class="cx"> UIProcess/WebOpenPanelResultListenerProxy.cpp
</span><span class="cx"> UIProcess/WebOriginDataManagerProxy.cpp
</span><del>- UIProcess/WebPageContextMenuClient.cpp
</del><span class="cx"> UIProcess/WebPageDiagnosticLoggingClient.cpp
</span><span class="cx"> UIProcess/WebPageGroup.cpp
</span><span class="cx"> UIProcess/WebPageProxy.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2015-01-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Add API::ContextMenuClient and API::InjectedBundle::PageContextMenuClient classes
+ https://bugs.webkit.org/show_bug.cgi?id=138466
+
+ Reviewed by Anders Carlsson.
+
+ Move ContextMenuClient to use API classes in both UI and Injected
+ Bundle APIs.
+
+ * CMakeLists.txt: Remove WebPageContextMenuClient.cpp.
+ * UIProcess/API/APIContextMenuClient.h: Renamed from Source/WebKit2/UIProcess/WebPageContextMenuClient.h.
+ (API::ContextMenuClient::~ContextMenuClient):
+ (API::ContextMenuClient::getContextMenuFromProposedMenu):
+ (API::ContextMenuClient::customContextMenuItemSelected):
+ (API::ContextMenuClient::contextMenuDismissed):
+ (API::ContextMenuClient::showContextMenu):
+ (API::ContextMenuClient::hideContextMenu):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageContextMenuClient):
+ * UIProcess/WebPageContextMenuClient.cpp: Removed.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setContextMenuClient):
+ (WebKit::WebPageProxy::close):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::contextMenuItemSelected):
+ (WebKit::WebPageProxy::initializeContextMenuClient): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj: Remove deleted files and add
+ new files to compilation.
+ * WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h: Copied from Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h.
+ (API::InjectedBundle::PageContextMenuClient::~PageContextMenuClient):
+ (API::InjectedBundle::PageContextMenuClient::getCustomMenuFromDefaultItems):
+ (API::InjectedBundle::PageContextMenuClient::prepareForActionMenu):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetContextMenuClient):
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
+ (WebKit::InjectedBundlePageContextMenuClient::InjectedBundlePageContextMenuClient):
+ (WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
+ (WebKit::InjectedBundlePageContextMenuClient::prepareForActionMenu):
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ (WebKit::WebContextMenu::menuItemsWithUserData):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setInjectedBundleContextMenuClient):
+ (WebKit::WebPage::close):
+ (WebKit::WebPage::initializeInjectedBundleContextMenuClient): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::injectedBundleContextMenuClient):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performActionMenuHitTestAtLocation):
+
</ins><span class="cx"> 2015-01-20 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKitTestRunner: Tests fail due to incorrect web view size
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIContextMenuClienthfromrev178888trunkSourceWebKit2UIProcessWebPageContextMenuClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h (from rev 178888, trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h) (0 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIContextMenuClient.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIContextMenuClient_h
+#define APIContextMenuClient_h
+
+#if ENABLE(CONTEXT_MENUS)
+
+#include "WebHitTestResult.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+class IntPoint;
+}
+
+namespace WebKit {
+class WebContextMenuItemData;
+class WebPageProxy;
+}
+
+namespace API {
+
+class ContextMenuClient {
+public:
+ virtual ~ContextMenuClient() { }
+
+ virtual bool getContextMenuFromProposedMenu(WebKit::WebPageProxy&, const Vector<WebKit::WebContextMenuItemData>& /* proposedMenu */, Vector<WebKit::WebContextMenuItemData>& /* customMenu */, const WebKit::WebHitTestResult::Data&, API::Object* /* userData */) { return false; }
+ virtual void customContextMenuItemSelected(WebKit::WebPageProxy&, const WebKit::WebContextMenuItemData&) { }
+ virtual void contextMenuDismissed(WebKit::WebPageProxy&) { }
+ virtual bool showContextMenu(WebKit::WebPageProxy&, const WebCore::IntPoint&, const Vector<WebKit::WebContextMenuItemData>&) { return false; }
+ virtual bool hideContextMenu(WebKit::WebPageProxy&) { return false; }
+};
+
+} // namespace API
+
+#endif // ENABLE(CONTEXT_MENUS)
+#endif // APIContextMenuClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "WKPagePrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIContextMenuClient.h"
</ins><span class="cx"> #include "APIData.h"
</span><span class="cx"> #include "APIDictionary.h"
</span><span class="cx"> #include "APIFindClient.h"
</span><span class="lines">@@ -83,6 +84,12 @@
</span><span class="cx"> typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3, WKPageUIClientV4, WKPageUIClientV5> Versions;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if ENABLE(CONTEXT_MENUS)
+template<> struct ClientTraits<WKPageContextMenuClientBase> {
+ typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions;
+};
+#endif
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKTypeID WKPageGetTypeID()
</span><span class="lines">@@ -715,7 +722,97 @@
</span><span class="cx"> void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClientBase* wkClient)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(pageRef)->initializeContextMenuClient(wkClient);
</del><ins>+ class ContextMenuClient final : public API::Client<WKPageContextMenuClientBase>, public API::ContextMenuClient {
+ public:
+ explicit ContextMenuClient(const WKPageContextMenuClientBase* client)
+ {
+ initialize(client);
+ }
+
+ private:
+ virtual bool getContextMenuFromProposedMenu(WebPageProxy& page, const Vector<WebContextMenuItemData>& proposedMenuVector, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data& hitTestResultData, API::Object* userData) override
+ {
+ if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0)
+ return false;
+
+ if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu)
+ return false;
+
+ Vector<RefPtr<API::Object>> proposedMenuItems;
+ proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
+
+ for (const auto& menuItem : proposedMenuVector)
+ proposedMenuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
+
+ WKArrayRef newMenu = nullptr;
+ if (m_client.base.version >= 2) {
+ RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(hitTestResultData);
+ m_client.getContextMenuFromProposedMenu(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo);
+ } else
+ m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.base.clientInfo);
+
+ RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
+
+ customMenu.clear();
+
+ size_t newSize = array ? array->size() : 0;
+ for (size_t i = 0; i < newSize; ++i) {
+ WebContextMenuItem* item = array->at<WebContextMenuItem>(i);
+ if (!item) {
+ LOG(ContextMenu, "New menu entry at index %i is not a WebContextMenuItem", (int)i);
+ continue;
+ }
+
+ customMenu.append(*item->data());
+ }
+
+ return true;
+ }
+
+ virtual void customContextMenuItemSelected(WebPageProxy& page, const WebContextMenuItemData& itemData) override
+ {
+ if (!m_client.customContextMenuItemSelected)
+ return;
+
+ m_client.customContextMenuItemSelected(toAPI(&page), toAPI(WebContextMenuItem::create(itemData).get()), m_client.base.clientInfo);
+ }
+
+ virtual void contextMenuDismissed(WebPageProxy& page) override
+ {
+ if (!m_client.contextMenuDismissed)
+ return;
+
+ m_client.contextMenuDismissed(toAPI(&page), m_client.base.clientInfo);
+ }
+
+ virtual bool showContextMenu(WebPageProxy& page, const WebCore::IntPoint& menuLocation, const Vector<WebContextMenuItemData>& menuItemsVector) override
+ {
+ if (!m_client.showContextMenu)
+ return false;
+
+ Vector<RefPtr<API::Object>> menuItems;
+ menuItems.reserveInitialCapacity(menuItemsVector.size());
+
+ for (const auto& menuItem : menuItemsVector)
+ menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
+
+ m_client.showContextMenu(toAPI(&page), toAPI(menuLocation), toAPI(API::Array::create(WTF::move(menuItems)).get()), m_client.base.clientInfo);
+
+ return true;
+ }
+
+ virtual bool hideContextMenu(WebPageProxy& page) override
+ {
+ if (!m_client.hideContextMenu)
+ return false;
+
+ m_client.hideContextMenu(toAPI(&page), m_client.base.clientInfo);
+
+ return true;
+ }
+ };
+
+ toImpl(pageRef)->setContextMenuClient(std::make_unique<ContextMenuClient>(wkClient));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(wkClient);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageContextMenuClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include "WebPageContextMenuClient.h"
-
-#include "APIArray.h"
-#include "Logging.h"
-#include "WKAPICast.h"
-#include "WKSharedAPICast.h"
-#include "WebContextMenuItem.h"
-#include "WebPageProxy.h"
-
-namespace WebKit {
-
-bool WebPageContextMenuClient::getContextMenuFromProposedMenu(WebPageProxy* page, const Vector<WebContextMenuItemData>& proposedMenuVector, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data& hitTestResultData, API::Object* userData)
-{
- if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0)
- return false;
-
- if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu)
- return false;
-
- Vector<RefPtr<API::Object>> proposedMenuItems;
- proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
-
- for (const auto& menuItem : proposedMenuVector)
- proposedMenuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
-
- WKArrayRef newMenu = nullptr;
- if (m_client.base.version >= 2) {
- RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(hitTestResultData);
- m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo);
- } else
- m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.base.clientInfo);
-
- RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
-
- customMenu.clear();
-
- size_t newSize = array ? array->size() : 0;
- for (size_t i = 0; i < newSize; ++i) {
- WebContextMenuItem* item = array->at<WebContextMenuItem>(i);
- if (!item) {
- LOG(ContextMenu, "New menu entry at index %i is not a WebContextMenuItem", (int)i);
- continue;
- }
-
- customMenu.append(*item->data());
- }
-
- return true;
-}
-
-void WebPageContextMenuClient::customContextMenuItemSelected(WebPageProxy* page, const WebContextMenuItemData& itemData)
-{
- if (!m_client.customContextMenuItemSelected)
- return;
-
- RefPtr<WebContextMenuItem> item = WebContextMenuItem::create(itemData);
- m_client.customContextMenuItemSelected(toAPI(page), toAPI(item.get()), m_client.base.clientInfo);
-}
-
-void WebPageContextMenuClient::contextMenuDismissed(WebPageProxy* page)
-{
- if (!m_client.contextMenuDismissed)
- return;
-
- m_client.contextMenuDismissed(toAPI(page), m_client.base.clientInfo);
-}
-
-bool WebPageContextMenuClient::showContextMenu(WebPageProxy* page, const WebCore::IntPoint& menuLocation, const Vector<WebContextMenuItemData>& menuItemsVector)
-{
- if (!m_client.showContextMenu)
- return false;
-
- Vector<RefPtr<API::Object>> menuItems;
- menuItems.reserveInitialCapacity(menuItemsVector.size());
-
- for (const auto& menuItem : menuItemsVector)
- menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
-
- m_client.showContextMenu(toAPI(page), toAPI(menuLocation), toAPI(API::Array::create(WTF::move(menuItems)).get()), m_client.base.clientInfo);
-
- return true;
-}
-
-bool WebPageContextMenuClient::hideContextMenu(WebPageProxy* page)
-{
- if (!m_client.hideContextMenu)
- return false;
-
- m_client.hideContextMenu(toAPI(page), m_client.base.clientInfo);
-
- return true;
-}
-
-} // namespace WebKit
-#endif // ENABLE(CONTEXT_MENUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageContextMenuClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebPageContextMenuClient_h
-#define WebPageContextMenuClient_h
-
-#if ENABLE(CONTEXT_MENUS)
-
-#include "APIClient.h"
-#include "WebHitTestResult.h"
-#include "WKPage.h"
-#include <WebCore/IntPoint.h>
-#include <wtf/Vector.h>
-
-namespace API {
-template<> struct ClientTraits<WKPageContextMenuClientBase> {
- typedef std::tuple<WKPageContextMenuClientV0, WKPageContextMenuClientV1, WKPageContextMenuClientV2, WKPageContextMenuClientV3> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebContextMenuItemData;
-class WebPageProxy;
-
-class WebPageContextMenuClient : public API::Client<WKPageContextMenuClientBase> {
-public:
- bool getContextMenuFromProposedMenu(WebPageProxy*, const Vector<WebContextMenuItemData>& proposedMenu, Vector<WebContextMenuItemData>& customMenu, const WebHitTestResult::Data&, API::Object* userData);
- void customContextMenuItemSelected(WebPageProxy*, const WebContextMenuItemData&);
- void contextMenuDismissed(WebPageProxy*);
- bool showContextMenu(WebPageProxy*, const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&);
- bool hideContextMenu(WebPageProxy*);
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(CONTEXT_MENUS)
-#endif // WebPageContextMenuClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIContextMenuClient.h"
</ins><span class="cx"> #include "APIFindClient.h"
</span><span class="cx"> #include "APIFormClient.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="lines">@@ -266,6 +267,9 @@
</span><span class="cx"> , m_uiClient(std::make_unique<API::UIClient>())
</span><span class="cx"> , m_findClient(std::make_unique<API::FindClient>())
</span><span class="cx"> , m_diagnosticLoggingClient(std::make_unique<API::DiagnosticLoggingClient>())
</span><ins>+#if ENABLE(CONTEXT_MENUS)
+ , m_contextMenuClient(std::make_unique<API::ContextMenuClient>())
+#endif
</ins><span class="cx"> , m_navigationState(std::make_unique<WebNavigationState>())
</span><span class="cx"> , m_process(process)
</span><span class="cx"> , m_pageGroup(*configuration.pageGroup)
</span><span class="lines">@@ -572,9 +576,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClientBase* client)
</del><ins>+void WebPageProxy::setContextMenuClient(std::unique_ptr<API::ContextMenuClient> contextMenuClient)
</ins><span class="cx"> {
</span><del>- m_contextMenuClient.initialize(client);
</del><ins>+ if (!contextMenuClient) {
+ m_contextMenuClient = std::make_unique<API::ContextMenuClient>();
+ return;
+ }
+
+ m_contextMenuClient = WTF::move(contextMenuClient);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -729,7 +738,7 @@
</span><span class="cx"> m_findMatchesClient.initialize(nullptr);
</span><span class="cx"> m_diagnosticLoggingClient = std::make_unique<API::DiagnosticLoggingClient>();
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- m_contextMenuClient.initialize(nullptr);
</del><ins>+ m_contextMenuClient = std::make_unique<API::ContextMenuClient>();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_webProcessLifetimeTracker.pageWasInvalidated();
</span><span class="lines">@@ -3851,9 +3860,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_activeContextMenuContextData = contextMenuContextData;
</span><span class="cx">
</span><del>- if (!m_contextMenuClient.hideContextMenu(this) && m_activeContextMenu) {
</del><ins>+ if (!m_contextMenuClient->hideContextMenu(*this) && m_activeContextMenu) {
</ins><span class="cx"> m_activeContextMenu->hideContextMenu();
</span><del>- m_activeContextMenu = 0;
</del><ins>+ m_activeContextMenu = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_activeContextMenu = m_pageClient.createContextMenuProxy(this);
</span><span class="lines">@@ -3872,21 +3881,21 @@
</span><span class="cx"> askClientToChangeMenu = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (askClientToChangeMenu && m_contextMenuClient.getContextMenuFromProposedMenu(this, proposedItems, items, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
</del><ins>+ if (askClientToChangeMenu && m_contextMenuClient->getContextMenuFromProposedMenu(*this, proposedItems, items, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
</ins><span class="cx"> useProposedItems = false;
</span><span class="cx">
</span><span class="cx"> const Vector<WebContextMenuItemData>& itemsToShow = useProposedItems ? proposedItems : items;
</span><del>- if (!m_contextMenuClient.showContextMenu(this, menuLocation, itemsToShow))
</del><ins>+ if (!m_contextMenuClient->showContextMenu(*this, menuLocation, itemsToShow))
</ins><span class="cx"> m_activeContextMenu->showContextMenu(menuLocation, itemsToShow, contextMenuContextData);
</span><span class="cx">
</span><del>- m_contextMenuClient.contextMenuDismissed(this);
</del><ins>+ m_contextMenuClient->contextMenuDismissed(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="cx"> {
</span><span class="cx"> // Application custom items don't need to round-trip through to WebCore in the WebProcess.
</span><span class="cx"> if (item.action() >= ContextMenuItemBaseApplicationTag) {
</span><del>- m_contextMenuClient.customContextMenuItemSelected(this, item);
</del><ins>+ m_contextMenuClient->customContextMenuItemSelected(*this, item);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebFindClient.h"
</span><span class="cx"> #include "WebFrameProxy.h"
</span><del>-#include "WebPageContextMenuClient.h"
</del><span class="cx"> #include "WebPageCreationParameters.h"
</span><span class="cx"> #include "WebPageDiagnosticLoggingClient.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="lines">@@ -113,6 +112,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><ins>+class ContextMenuClient;
</ins><span class="cx"> class FindClient;
</span><span class="cx"> class FormClient;
</span><span class="cx"> class LoaderClient;
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- void initializeContextMenuClient(const WKPageContextMenuClientBase*);
</del><ins>+ void setContextMenuClient(std::unique_ptr<API::ContextMenuClient>);
</ins><span class="cx"> #endif
</span><span class="cx"> API::FindClient& findClient() { return *m_findClient; }
</span><span class="cx"> void setFindClient(std::unique_ptr<API::FindClient>);
</span><span class="lines">@@ -1379,7 +1379,7 @@
</span><span class="cx"> WebFindMatchesClient m_findMatchesClient;
</span><span class="cx"> std::unique_ptr<API::DiagnosticLoggingClient> m_diagnosticLoggingClient;
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- WebPageContextMenuClient m_contextMenuClient;
</del><ins>+ std::unique_ptr<API::ContextMenuClient> m_contextMenuClient;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebNavigationState> m_navigationState;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> 00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661518E24CBA00CE1F88 /* APIFindClient.h */; };
</span><span class="cx"> 00B9661918E25AE100CE1F88 /* FindClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 00B9661718E25AE100CE1F88 /* FindClient.mm */; };
</span><span class="cx"> 00B9661A18E25AE100CE1F88 /* FindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661818E25AE100CE1F88 /* FindClient.h */; };
</span><ins>+ 076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */; };
</ins><span class="cx"> 0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */; };
</span><span class="cx"> 0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F0C365918C0555800F607D7 /* LayerRepresentation.h */; };
</span><span class="cx"> 0F0C365C18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */; };
</span><span class="lines">@@ -891,8 +892,6 @@
</span><span class="cx"> 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */; };
</span><span class="cx"> 514D9F5719119D35000063A7 /* ServicesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 514D9F5519119D35000063A7 /* ServicesController.h */; };
</span><span class="cx"> 514D9F5819119D35000063A7 /* ServicesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514D9F5619119D35000063A7 /* ServicesController.mm */; };
</span><del>- 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */; };
- 5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */; };
</del><span class="cx"> 51578B831209ECEF00A37C4A /* APIData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* APIData.h */; };
</span><span class="cx"> 515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; };
</span><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; };
</span><span class="lines">@@ -2090,6 +2089,8 @@
</span><span class="cx"> 00B9661518E24CBA00CE1F88 /* APIFindClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFindClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 00B9661718E25AE100CE1F88 /* FindClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FindClient.mm; sourceTree = "<group>"; };
</span><span class="cx"> 00B9661818E25AE100CE1F88 /* FindClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindClient.h; sourceTree = "<group>"; };
</span><ins>+ 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextMenuClient.h; sourceTree = "<group>"; };
+ 076E884F1A13CBC6005E90FC /* APIInjectedBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundlePageContextMenuClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
</span><span class="cx"> 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RemoteLayerTreeHostIOS.mm; path = ios/RemoteLayerTreeHostIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3003,8 +3004,6 @@
</span><span class="cx"> 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 514D9F5519119D35000063A7 /* ServicesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesController.h; sourceTree = "<group>"; };
</span><span class="cx"> 514D9F5619119D35000063A7 /* ServicesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesController.mm; sourceTree = "<group>"; };
</span><del>- 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageContextMenuClient.cpp; sourceTree = "<group>"; };
- 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageContextMenuClient.h; sourceTree = "<group>"; };
</del><span class="cx"> 51578B821209ECEF00A37C4A /* APIData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIData.h; sourceTree = "<group>"; };
</span><span class="cx"> 515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6067,8 +6066,6 @@
</span><span class="cx"> 755422BE18062BE40046F6A8 /* WebOriginDataManagerProxy.cpp */,
</span><span class="cx"> 755422BF18062BE40046F6A8 /* WebOriginDataManagerProxy.h */,
</span><span class="cx"> 755422C018062BE40046F6A8 /* WebOriginDataManagerProxy.messages.in */,
</span><del>- 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */,
- 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */,
</del><span class="cx"> 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */,
</span><span class="cx"> 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */,
</span><span class="cx"> BC7B6205129A0A6700D174A4 /* WebPageGroup.cpp */,
</span><span class="lines">@@ -6135,6 +6132,7 @@
</span><span class="cx"> 7C89D2921A67122F003A5FDE /* APIUserScript.h */,
</span><span class="cx"> 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
</span><span class="cx"> 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
</span><ins>+ 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = API;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -6435,6 +6433,7 @@
</span><span class="cx"> BC204EE711C83EAD008F3375 /* API */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 076E884F1A13CBC6005E90FC /* APIInjectedBundlePageContextMenuClient.h */,
</ins><span class="cx"> BC204EE811C83EB7008F3375 /* c */,
</span><span class="cx"> 1F0181681858DC1500F92884 /* Cocoa */,
</span><span class="cx"> BC989D4516181691000D46D3 /* mac */,
</span><span class="lines">@@ -7832,7 +7831,6 @@
</span><span class="cx"> 759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */,
</span><span class="cx"> 75E749EC180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h in Headers */,
</span><span class="cx"> BC032D8F10F437A00058C15A /* WebPage.h in Headers */,
</span><del>- 5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */,
</del><span class="cx"> BC7B6206129A0A6700D174A4 /* WebPageGroup.h in Headers */,
</span><span class="cx"> BC7B625212A43C9600D174A4 /* WebPageGroupData.h in Headers */,
</span><span class="cx"> BC7B621512A4219A00D174A4 /* WebPageGroupProxy.h in Headers */,
</span><span class="lines">@@ -7912,6 +7910,7 @@
</span><span class="cx"> BCDDB317124EBD130048D13C /* WKBase.h in Headers */,
</span><span class="cx"> 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */,
</span><span class="cx"> BCBAAC73144E619E0053F82F /* WKBrowsingContextController.h in Headers */,
</span><ins>+ 076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */,
</ins><span class="cx"> BCBAAC74144E61A50053F82F /* WKBrowsingContextControllerInternal.h in Headers */,
</span><span class="cx"> 3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */,
</span><span class="cx"> BCBAACF41452324F0053F82F /* WKBrowsingContextGroup.h in Headers */,
</span><span class="lines">@@ -9576,7 +9575,6 @@
</span><span class="cx"> 755422C418062BF90046F6A8 /* WebOriginDataManagerProxy.cpp in Sources */,
</span><span class="cx"> 75E749EB180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */,
</span><del>- 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */,
</del><span class="cx"> C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */,
</span><span class="cx"> BC7B6207129A0A6700D174A4 /* WebPageGroup.cpp in Sources */,
</span><span class="cx"> BC7B625312A43C9600D174A4 /* WebPageGroupData.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIAPIInjectedBundlePageContextMenuClienthfromrev178888trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h (from rev 178888, trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h) (0 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundlePageContextMenuClient.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIInjectedBundlePageContextMenuClient_h
+#define APIInjectedBundlePageContextMenuClient_h
+
+#if ENABLE(CONTEXT_MENUS)
+
+#include <wtf/Vector.h>
+
+namespace WebCore {
+class ContextMenuItem;
+class HitTestResult;
+}
+
+namespace WebKit {
+class WebContextMenuItemData;
+class WebFrame;
+class WebPage;
+class WebSecurityOrigin;
+}
+
+namespace API {
+class Object;
+
+namespace InjectedBundle {
+
+class PageContextMenuClient {
+public:
+ virtual ~PageContextMenuClient() { }
+
+ virtual bool getCustomMenuFromDefaultItems(WebKit::WebPage&, const WebCore::HitTestResult&, const Vector<WebCore::ContextMenuItem>& /* defaultMenu */, Vector<WebKit::WebContextMenuItemData>& /* newMenu */, RefPtr<API::Object>& /* userData */) { return false; }
+ virtual void prepareForActionMenu(WebKit::WebPage&, const WebCore::HitTestResult&, RefPtr<API::Object>& /* userData */) { }
+};
+
+} // namespace InjectedBundle
+
+} // namespace API
+
+#endif // ENABLE(CONTEXT_MENUS)
+#endif // APIInjectedBundlePageContextMenuClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClientBase* wkClient)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
</del><ins>+ toImpl(pageRef)->setInjectedBundleContextMenuClient(std::make_unique<InjectedBundlePageContextMenuClient>(wkClient));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(wkClient);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -42,19 +42,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-bool InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems(WebPage* page, InjectedBundleHitTestResult* hitTestResult, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData)
</del><ins>+InjectedBundlePageContextMenuClient::InjectedBundlePageContextMenuClient(const WKBundlePageContextMenuClientBase* client)
</ins><span class="cx"> {
</span><ins>+ initialize(client);
+}
+
+bool InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems(WebPage& page, const HitTestResult& hitTestResult, const Vector<ContextMenuItem>& proposedMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData)
+{
</ins><span class="cx"> if (!m_client.getContextMenuFromDefaultMenu)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ Vector<WebContextMenuItemData> defaultMenu = kitItems(proposedMenu);
</ins><span class="cx"> Vector<RefPtr<API::Object>> defaultMenuItems;
</span><span class="cx"> defaultMenuItems.reserveInitialCapacity(defaultMenu.size());
</span><span class="cx"> for (const auto& item : defaultMenu)
</span><span class="cx"> defaultMenuItems.uncheckedAppend(WebContextMenuItem::create(item));
</span><span class="cx">
</span><del>- WKArrayRef newMenuWK = 0;
- WKTypeRef userDataToPass = 0;
- m_client.getContextMenuFromDefaultMenu(toAPI(page), toAPI(hitTestResult), toAPI(API::Array::create(WTF::move(defaultMenuItems)).get()), &newMenuWK, &userDataToPass, m_client.base.clientInfo);
</del><ins>+ WKArrayRef newMenuWK = nullptr;
+ WKTypeRef userDataToPass = nullptr;
+ m_client.getContextMenuFromDefaultMenu(toAPI(&page), toAPI(InjectedBundleHitTestResult::create(hitTestResult).get()), toAPI(API::Array::create(WTF::move(defaultMenuItems)).get()), &newMenuWK, &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> RefPtr<API::Array> array = adoptRef(toImpl(newMenuWK));
</span><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx">
</span><span class="lines">@@ -77,13 +83,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageContextMenuClient::prepareForActionMenu(WebPage* page, InjectedBundleHitTestResult* hitTestResult, RefPtr<API::Object>& userData)
</del><ins>+void InjectedBundlePageContextMenuClient::prepareForActionMenu(WebPage& page, const HitTestResult& hitTestResult, RefPtr<API::Object>& userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.prepareForActionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = nullptr;
</span><del>- m_client.prepareForActionMenu(toAPI(page), toAPI(hitTestResult), &userDataToPass, m_client.base.clientInfo);
</del><ins>+ m_client.prepareForActionMenu(toAPI(&page), toAPI(InjectedBundleHitTestResult::create(hitTestResult).get()), &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> #include "APIClient.h"
</span><ins>+#include "APIInjectedBundlePageContextMenuClient.h"
</ins><span class="cx"> #include "WKBundlePage.h"
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Object;
</span><span class="lines">@@ -41,19 +41,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class ContextMenu;
</del><ins>+class ContextMenuItem;
+class HitTestResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-
-class InjectedBundleHitTestResult;
</del><span class="cx"> class WebContextMenuItemData;
</span><span class="cx"> class WebPage;
</span><span class="cx">
</span><del>-class InjectedBundlePageContextMenuClient : public API::Client<WKBundlePageContextMenuClientBase> {
</del><ins>+class InjectedBundlePageContextMenuClient : public API::Client<WKBundlePageContextMenuClientBase>, public API::InjectedBundle::PageContextMenuClient {
</ins><span class="cx"> public:
</span><del>- bool getCustomMenuFromDefaultItems(WebPage*, InjectedBundleHitTestResult*, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData);
- void prepareForActionMenu(WebPage*, InjectedBundleHitTestResult*, RefPtr<API::Object>& userData);
</del><ins>+ explicit InjectedBundlePageContextMenuClient(const WKBundlePageContextMenuClientBase*);
+
+private:
+ bool getCustomMenuFromDefaultItems(WebPage&, const WebCore::HitTestResult&, const Vector<WebCore::ContextMenuItem>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<API::Object>& userData) override;
+ void prepareForActionMenu(WebPage&, const WebCore::HitTestResult&, RefPtr<API::Object>& userData) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -26,10 +26,8 @@
</span><span class="cx"> #include "WebContextMenu.h"
</span><span class="cx">
</span><span class="cx"> #include "ContextMenuContextData.h"
</span><del>-#include "InjectedBundleHitTestResult.h"
</del><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebHitTestResult.h"
</del><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="lines">@@ -93,12 +91,9 @@
</span><span class="cx"> Vector<ContextMenuItem> coreItems = contextMenuItemVector(menu->platformDescription());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Vector<WebContextMenuItemData> proposedMenu = kitItems(coreItems);
- Vector<WebContextMenuItemData> newMenu;
- RefPtr<InjectedBundleHitTestResult> hitTestResult = InjectedBundleHitTestResult::create(controller.hitTestResult());
- if (m_page->injectedBundleContextMenuClient().getCustomMenuFromDefaultItems(m_page, hitTestResult.get(), proposedMenu, newMenu, userData))
- proposedMenu = newMenu;
- menuItems = proposedMenu;
</del><ins>+ if (m_page->injectedBundleContextMenuClient().getCustomMenuFromDefaultItems(*m_page, controller.hitTestResult(), coreItems, menuItems, userData))
+ return;
+ menuItems = kitItems(coreItems);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<WebContextMenuItemData> WebContextMenu::items() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -276,6 +276,9 @@
</span><span class="cx"> , m_accessibilityObject(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
</span><ins>+#if ENABLE(CONTEXT_MENUS)
+ , m_contextMenuClient(std::make_unique<API::InjectedBundle::PageContextMenuClient>())
+#endif
</ins><span class="cx"> , m_formClient(std::make_unique<API::InjectedBundle::FormClient>())
</span><span class="cx"> , m_uiClient(std::make_unique<API::InjectedBundle::PageUIClient>())
</span><span class="cx"> , m_findController(this)
</span><span class="lines">@@ -587,9 +590,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-void WebPage::initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClientBase* client)
</del><ins>+void WebPage::setInjectedBundleContextMenuClient(std::unique_ptr<API::InjectedBundle::PageContextMenuClient> contextMenuClient)
</ins><span class="cx"> {
</span><del>- m_contextMenuClient.initialize(client);
</del><ins>+ if (!contextMenuClient) {
+ m_contextMenuClient = std::make_unique<API::InjectedBundle::PageContextMenuClient>();
+ return;
+ }
+
+ m_contextMenuClient = WTF::move(contextMenuClient);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1005,7 +1013,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- m_contextMenuClient.initialize(0);
</del><ins>+ m_contextMenuClient = std::make_unique<API::InjectedBundle::PageContextMenuClient>();
</ins><span class="cx"> #endif
</span><span class="cx"> m_editorClient.initialize(0);
</span><span class="cx"> m_formClient = std::make_unique<API::InjectedBundle::FormClient>();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebPage_h
</span><span class="cx">
</span><span class="cx"> #include "APIInjectedBundleFormClient.h"
</span><ins>+#include "APIInjectedBundlePageContextMenuClient.h"
</ins><span class="cx"> #include "APIInjectedBundlePageUIClient.h"
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "DictionaryPopupInfo.h"
</span><span class="lines">@@ -281,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> // -- InjectedBundle methods
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- void initializeInjectedBundleContextMenuClient(WKBundlePageContextMenuClientBase*);
</del><ins>+ void setInjectedBundleContextMenuClient(std::unique_ptr<API::InjectedBundle::PageContextMenuClient>);
</ins><span class="cx"> #endif
</span><span class="cx"> void initializeInjectedBundleEditorClient(WKBundlePageEditorClientBase*);
</span><span class="cx"> void setInjectedBundleFormClient(std::unique_ptr<API::InjectedBundle::FormClient>);
</span><span class="lines">@@ -295,7 +296,7 @@
</span><span class="cx"> void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase*);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- InjectedBundlePageContextMenuClient& injectedBundleContextMenuClient() { return m_contextMenuClient; }
</del><ins>+ API::InjectedBundle::PageContextMenuClient& injectedBundleContextMenuClient() { return *m_contextMenuClient.get(); }
</ins><span class="cx"> #endif
</span><span class="cx"> InjectedBundlePageEditorClient& injectedBundleEditorClient() { return m_editorClient; }
</span><span class="cx"> API::InjectedBundle::FormClient& injectedBundleFormClient() { return *m_formClient.get(); }
</span><span class="lines">@@ -1182,7 +1183,7 @@
</span><span class="cx"> WebCore::IntSize m_windowResizerSize;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- InjectedBundlePageContextMenuClient m_contextMenuClient;
</del><ins>+ std::unique_ptr<API::InjectedBundle::PageContextMenuClient> m_contextMenuClient;
</ins><span class="cx"> #endif
</span><span class="cx"> InjectedBundlePageEditorClient m_editorClient;
</span><span class="cx"> std::unique_ptr<API::InjectedBundle::FormClient> m_formClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (178888 => 178889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-01-22 06:39:31 UTC (rev 178888)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-01-22 07:53:01 UTC (rev 178889)
</span><span class="lines">@@ -1079,8 +1079,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- RefPtr<InjectedBundleHitTestResult> injectedBundleHitTestResult = InjectedBundleHitTestResult::create(hitTestResult);
- injectedBundleContextMenuClient().prepareForActionMenu(this, injectedBundleHitTestResult.get(), userData);
</del><ins>+ injectedBundleContextMenuClient().prepareForActionMenu(*this, hitTestResult, userData);
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::DidPerformActionMenuHitTest(actionMenuResult, forImmediateAction, UserData(WebProcess::shared().transformObjectsToHandles(userData.get()).get())));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>