Diff
Modified: trunk/Source/WebKit/CMakeLists.txt (227000 => 227001)
--- trunk/Source/WebKit/CMakeLists.txt 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/CMakeLists.txt 2018-01-16 21:58:34 UTC (rev 227001)
@@ -312,6 +312,7 @@
UIProcess/WebContextClient.cpp
UIProcess/WebContextConnectionClient.cpp
UIProcess/WebContextInjectedBundleClient.cpp
+ UIProcess/WebContextMenuListenerProxy.cpp
UIProcess/WebContextMenuProxy.cpp
UIProcess/WebCookieManagerProxy.cpp
UIProcess/WebCookieManagerProxyClient.cpp
Modified: trunk/Source/WebKit/ChangeLog (227000 => 227001)
--- trunk/Source/WebKit/ChangeLog 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/ChangeLog 2018-01-16 21:58:34 UTC (rev 227001)
@@ -1,3 +1,32 @@
+2018-01-16 Alex Christensen <[email protected]>
+
+ Merge sync and async code paths for getting context menus
+ https://bugs.webkit.org/show_bug.cgi?id=181423
+
+ Reviewed by Joseph Pecoraro.
+
+ What a mess. We had a code path for asynchronous context menu generation and a different one for synchronous context menu generation.
+ This makes it so there is just one. At the API level we see if there is an asynchronous delegate to call, then synchronous.
+ There is a subtle theoretical change in behaviour because m_page.contextMenuClient().showContextMenu is now called for the asynchronous
+ case and it wasn't before, but the one C API client that uses this has nullptr as it's WKPageShowContextMenuCallback, so we won't break anything!
+
+ * UIProcess/API/APIContextMenuClient.h:
+ (API::ContextMenuClient::getContextMenuFromProposedMenu):
+ (API::ContextMenuClient::getContextMenuFromProposedMenuAsync): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageContextMenuClient):
+ * UIProcess/API/glib/WebKitContextMenuClient.cpp:
+ * UIProcess/WebContextMenuProxy.h:
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::WebContextMenuProxyGtk::show):
+ (WebKit::WebContextMenuProxyGtk::showContextMenuWithItems):
+ * UIProcess/gtk/WebContextMenuProxyGtk.h:
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::showContextMenuWithItems):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ * UIProcess/wpe/WebContextMenuProxyWPE.h:
+
2018-01-16 Michael Catanzaro <[email protected]>
Don't link WebKit target directly to _javascript_Core
Modified: trunk/Source/WebKit/PlatformMac.cmake (227000 => 227001)
--- trunk/Source/WebKit/PlatformMac.cmake 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/PlatformMac.cmake 2018-01-16 21:58:34 UTC (rev 227001)
@@ -168,7 +168,6 @@
UIProcess/HighPerformanceGraphicsUsageSampler.cpp
UIProcess/PerActivityStateCPUUsageSampler.cpp
- UIProcess/WebContextMenuListenerProxy.cpp
UIProcess/WebResourceLoadStatisticsStore.cpp
UIProcess/WebResourceLoadStatisticsTelemetry.cpp
Modified: trunk/Source/WebKit/UIProcess/API/APIContextMenuClient.h (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/API/APIContextMenuClient.h 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/API/APIContextMenuClient.h 2018-01-16 21:58:34 UTC (rev 227001)
@@ -27,6 +27,7 @@
#if ENABLE(CONTEXT_MENUS)
+#include "WebContextMenuItem.h"
#include "WebContextMenuListenerProxy.h"
#include "WebHitTestResultData.h"
#include <WebKit/WKBase.h>
@@ -40,7 +41,6 @@
}
namespace WebKit {
-class WebContextMenuItem;
class WebContextMenuItemData;
class WebPageProxy;
}
@@ -51,8 +51,7 @@
public:
virtual ~ContextMenuClient() { }
- virtual bool getContextMenuFromProposedMenu(WebKit::WebPageProxy&, const Vector<Ref<WebKit::WebContextMenuItem>>& /* proposedMenu */, Vector<Ref<WebKit::WebContextMenuItem>>& /* customMenu */, const WebKit::WebHitTestResultData&, API::Object* /* userData */) { return false; }
- virtual bool getContextMenuFromProposedMenuAsync(WebKit::WebPageProxy&, const Vector<Ref<WebKit::WebContextMenuItem>>& /* proposedMenu */, WebKit::WebContextMenuListenerProxy*, const WebKit::WebHitTestResultData&, API::Object* /* userData */) { return false; }
+ virtual void getContextMenuFromProposedMenu(WebKit::WebPageProxy&, Vector<Ref<WebKit::WebContextMenuItem>>&& proposedMenu, WebKit::WebContextMenuListenerProxy& listener, const WebKit::WebHitTestResultData&, API::Object* /* userData */) { listener.useContextMenuItems(WTFMove(proposedMenu)); }
virtual void customContextMenuItemSelected(WebKit::WebPageProxy&, const WebKit::WebContextMenuItemData&) { }
virtual bool showContextMenu(WebKit::WebPageProxy&, const WebCore::IntPoint&, const Vector<Ref<WebKit::WebContextMenuItem>>&) { return false; }
virtual bool hideContextMenu(WebKit::WebPageProxy&) { return false; }
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-01-16 21:58:34 UTC (rev 227001)
@@ -818,13 +818,29 @@
}
private:
- bool getContextMenuFromProposedMenu(WebPageProxy& page, const Vector<Ref<WebKit::WebContextMenuItem>>& proposedMenuVector, Vector<Ref<WebKit::WebContextMenuItem>>& customMenu, const WebHitTestResultData& hitTestResultData, API::Object* userData) override
+ void getContextMenuFromProposedMenu(WebPageProxy& page, Vector<Ref<WebKit::WebContextMenuItem>>&& proposedMenuVector, WebKit::WebContextMenuListenerProxy& contextMenuListener, const WebHitTestResultData& hitTestResultData, API::Object* userData) override
{
- if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0)
- return false;
+ if (m_client.base.version >= 4 && m_client.getContextMenuFromProposedMenuAsync) {
+ Vector<RefPtr<API::Object>> proposedMenuItems;
+ proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
+
+ for (const auto& menuItem : proposedMenuVector)
+ proposedMenuItems.uncheckedAppend(menuItem.ptr());
+
+ auto webHitTestResult = API::HitTestResult::create(hitTestResultData);
+ m_client.getContextMenuFromProposedMenuAsync(toAPI(&page), toAPI(API::Array::create(WTFMove(proposedMenuItems)).ptr()), toAPI(&contextMenuListener), toAPI(webHitTestResult.ptr()), toAPI(userData), m_client.base.clientInfo);
+ return;
+ }
+
+ if (!m_client.getContextMenuFromProposedMenu && !m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0) {
+ contextMenuListener.useContextMenuItems(WTFMove(proposedMenuVector));
+ return;
+ }
- if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu)
- return false;
+ if (m_client.base.version >= 2 && !m_client.getContextMenuFromProposedMenu) {
+ contextMenuListener.useContextMenuItems(WTFMove(proposedMenuVector));
+ return;
+ }
Vector<RefPtr<API::Object>> proposedMenuItems;
proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
@@ -841,9 +857,9 @@
RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
- customMenu.clear();
-
+ Vector<Ref<WebContextMenuItem>> customMenu;
size_t newSize = array ? array->size() : 0;
+ customMenu.reserveInitialCapacity(newSize);
for (size_t i = 0; i < newSize; ++i) {
WebContextMenuItem* item = array->at<WebContextMenuItem>(i);
if (!item) {
@@ -851,29 +867,12 @@
continue;
}
- customMenu.append(*item);
+ customMenu.uncheckedAppend(*item);
}
- return true;
+ contextMenuListener.useContextMenuItems(WTFMove(customMenu));
}
- bool getContextMenuFromProposedMenuAsync(WebPageProxy& page, const Vector<Ref<WebKit::WebContextMenuItem>>& proposedMenuVector, WebKit::WebContextMenuListenerProxy* contextMenuListener, const WebHitTestResultData& hitTestResultData, API::Object* userData) override
- {
- if (m_client.base.version < 4 || !m_client.getContextMenuFromProposedMenuAsync)
- return false;
-
- Vector<RefPtr<API::Object>> proposedMenuItems;
- proposedMenuItems.reserveInitialCapacity(proposedMenuVector.size());
-
- for (const auto& menuItem : proposedMenuVector)
- proposedMenuItems.uncheckedAppend(menuItem.ptr());
-
- RefPtr<API::HitTestResult> webHitTestResult = API::HitTestResult::create(hitTestResultData);
- m_client.getContextMenuFromProposedMenuAsync(toAPI(&page), toAPI(API::Array::create(WTFMove(proposedMenuItems)).ptr()), toAPI(contextMenuListener), toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo);
-
- return true;
- }
-
void customContextMenuItemSelected(WebPageProxy& page, const WebContextMenuItemData& itemData) override
{
if (!m_client.customContextMenuItemSelected)
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitContextMenuClient.cpp (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitContextMenuClient.cpp 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitContextMenuClient.cpp 2018-01-16 21:58:34 UTC (rev 227001)
@@ -34,7 +34,7 @@
}
private:
- bool getContextMenuFromProposedMenu(WebPageProxy&, const Vector<Ref<WebContextMenuItem>>& proposedMenu, Vector<Ref<WebContextMenuItem>>&, const WebHitTestResultData& hitTestResultData, API::Object* userData) override
+ void getContextMenuFromProposedMenu(WebPageProxy&, Vector<Ref<WebKit::WebContextMenuItem>>&& proposedMenu, WebKit::WebContextMenuListenerProxy& contextMenuListener, const WebHitTestResultData& hitTestResultData, API::Object* userData) override
{
GRefPtr<GVariant> variant;
if (userData) {
@@ -48,7 +48,7 @@
for (auto& item : proposedMenu)
menuItems.uncheckedAppend(item->data());
webkitWebViewPopulateContextMenu(m_webView, menuItems, hitTestResultData, variant.get());
- return true;
+ contextMenuListener.useContextMenuItems({ });
}
WebKitWebView* m_webView;
Modified: trunk/Source/WebKit/UIProcess/WebContextMenuProxy.h (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/WebContextMenuProxy.h 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/WebContextMenuProxy.h 2018-01-16 21:58:34 UTC (rev 227001)
@@ -41,7 +41,7 @@
virtual void show() = 0;
- virtual void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) = 0;
+ virtual void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) = 0;
protected:
WebContextMenuProxy(ContextMenuContextData&&, const UserData&);
Modified: trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.cpp (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2018-01-16 21:58:34 UTC (rev 227001)
@@ -149,14 +149,11 @@
proposedAPIItems.append(WebContextMenuItem::create(item));
}
- Vector<Ref<WebContextMenuItem>> clientItems;
- bool useProposedItems = true;
+ m_page->contextMenuClient().getContextMenuFromProposedMenu(*m_page, WTFMove(proposedAPIItems), WebContextMenuListenerProxy::create(this).get(), m_context.webHitTestResultData(), m_page->process().transformHandlesToObjects(m_userData.object()).get());
+}
- if (m_page->contextMenuClient().getContextMenuFromProposedMenu(*m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page->process().transformHandlesToObjects(m_userData.object()).get()))
- useProposedItems = false;
-
- const Vector<Ref<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
-
+void WebContextMenuProxyGtk::showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&& items)
+{
if (!items.isEmpty())
populate(items);
@@ -171,14 +168,9 @@
NativeWebMouseEvent* mouseEvent = m_page->currentlyProcessedMouseDownEvent();
const GdkEvent* event = mouseEvent ? mouseEvent->nativeEvent() : 0;
gtk_menu_attach_to_widget(m_menu, GTK_WIDGET(m_webView), nullptr);
- gtk_menu_popup(m_menu, nullptr, nullptr, reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this,
- event ? event->button.button : 3, event ? event->button.time : GDK_CURRENT_TIME);
+ gtk_menu_popup(m_menu, nullptr, nullptr, reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, event ? event->button.button : 3, event ? event->button.time : GDK_CURRENT_TIME);
}
-void WebContextMenuProxyGtk::showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&)
-{
-}
-
WebContextMenuProxyGtk::WebContextMenuProxyGtk(GtkWidget* webView, WebPageProxy& page, ContextMenuContextData&& context, const UserData& userData)
: WebContextMenuProxy(WTFMove(context), userData)
, m_webView(webView)
Modified: trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.h (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.h 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.h 2018-01-16 21:58:34 UTC (rev 227001)
@@ -55,7 +55,7 @@
private:
WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, ContextMenuContextData&&, const UserData&);
void show() override;
- void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) override;
+ void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
void append(GMenu*, const WebContextMenuItemGlib&);
GRefPtr<GMenu> buildMenu(const Vector<WebContextMenuItemGlib>&);
void populate(const Vector<Ref<WebContextMenuItem>>&);
Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h 2018-01-16 21:58:34 UTC (rev 227001)
@@ -54,7 +54,7 @@
~WebContextMenuProxyMac();
void contextMenuItemSelected(const WebContextMenuItemData&);
- void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) override;
+ void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
#if ENABLE(SERVICE_CONTROLS)
void clearServicesMenu();
Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2018-01-16 21:58:34 UTC (rev 227001)
@@ -451,8 +451,14 @@
}
}
-void WebContextMenuProxyMac::showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>& items)
+void WebContextMenuProxyMac::showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&& items)
{
+ if (m_page.contextMenuClient().showContextMenu(m_page, m_context.menuLocation(), items))
+ return;
+
+ if (items.isEmpty())
+ return;
+
Vector<WebContextMenuItemData> data;
data.reserveInitialCapacity(items.size());
for (auto& item : items)
@@ -478,9 +484,6 @@
for (auto& item : m_context.menuItems())
proposedAPIItems.append(WebContextMenuItem::create(item));
- Vector<Ref<WebContextMenuItem>> clientItems;
- bool useProposedItems = true;
-
if (m_contextMenuListener) {
m_contextMenuListener->invalidate();
m_contextMenuListener = nullptr;
@@ -488,22 +491,7 @@
m_contextMenuListener = WebContextMenuListenerProxy::create(this);
- if (m_page.contextMenuClient().getContextMenuFromProposedMenuAsync(m_page, proposedAPIItems, m_contextMenuListener.get(), m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
- return;
-
- // FIXME: Get rid of these two client calls once we don't need to support the C SPI.
- if (m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
- useProposedItems = false;
-
- if (m_page.contextMenuClient().showContextMenu(m_page, m_context.menuLocation(), useProposedItems ? proposedAPIItems : clientItems))
- return;
-
- auto&& items = WTFMove(useProposedItems ? proposedAPIItems : clientItems);
-
- if (items.isEmpty())
- return;
-
- showContextMenuWithItems(items);
+ m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, WTFMove(proposedAPIItems), *m_contextMenuListener, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get());
}
NSWindow *WebContextMenuProxyMac::window() const
Modified: trunk/Source/WebKit/UIProcess/wpe/WebContextMenuProxyWPE.h (227000 => 227001)
--- trunk/Source/WebKit/UIProcess/wpe/WebContextMenuProxyWPE.h 2018-01-16 21:52:09 UTC (rev 227000)
+++ trunk/Source/WebKit/UIProcess/wpe/WebContextMenuProxyWPE.h 2018-01-16 21:58:34 UTC (rev 227001)
@@ -36,7 +36,7 @@
return adoptRef(*new WebContextMenuProxyWPE(WTFMove(context), userData));
}
- void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) final { }
+ void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) final { }
void show() final { };
private:
