Diff
Modified: trunk/Source/WebKit2/ChangeLog (191130 => 191131)
--- 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)
@@ -1,3 +1,28 @@
+2015-10-15 Anders Carlsson <ander...@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):
+
2015-10-15 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (191130 => 191131)
--- 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)
@@ -44,8 +44,10 @@
{
}
-ContextMenuContextData::ContextMenuContextData(const ContextMenuContext& context)
- : m_webHitTestResultData(context.hitTestResult(), true)
+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)
, m_selectedText(context.selectedText())
#if ENABLE(SERVICE_CONTROLS)
, m_selectionIsEditable(false)
@@ -64,6 +66,8 @@
void ContextMenuContextData::encode(IPC::ArgumentEncoder& encoder) const
{
+ encoder << m_menuLocation;
+ encoder << m_menuItems;
encoder << m_webHitTestResultData;
encoder << m_selectedText;
@@ -75,21 +79,27 @@
#endif
}
-bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& contextMenuContextData)
+bool ContextMenuContextData::decode(IPC::ArgumentDecoder& decoder, ContextMenuContextData& result)
{
- if (!decoder.decode(contextMenuContextData.m_webHitTestResultData))
+ if (!decoder.decode(result.m_menuLocation))
return false;
- if (!decoder.decode(contextMenuContextData.m_selectedText))
+ if (!decoder.decode(result.m_menuItems))
return false;
+ if (!decoder.decode(result.m_webHitTestResultData))
+ return false;
+
+ if (!decoder.decode(result.m_selectedText))
+ return false;
+
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
if (!decoder.decode(handle))
return false;
if (!handle.isNull())
- contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
+ result.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
#endif
return true;
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.h (191130 => 191131)
--- 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)
@@ -30,6 +30,7 @@
#if ENABLE(CONTEXT_MENUS)
#include "ShareableBitmap.h"
+#include "WebContextMenuItemData.h"
#include "WebHitTestResultData.h"
namespace IPC {
@@ -46,14 +47,19 @@
class ContextMenuContextData {
public:
ContextMenuContextData();
- ContextMenuContextData(const WebCore::ContextMenuContext&);
-
+ 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; }
+
const WebHitTestResultData& webHitTestResultData() const { return m_webHitTestResultData; }
const String& selectedText() const { return m_selectedText; }
#if ENABLE(SERVICE_CONTROLS)
- ContextMenuContextData(const Vector<uint8_t>& selectionData, const Vector<String>& selectedTelephoneNumbers, bool isEditable)
- : m_controlledSelectionData(selectionData)
+ 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)
, m_selectedTelephoneNumbers(selectedTelephoneNumbers)
, m_selectionIsEditable(isEditable)
{
@@ -71,6 +77,9 @@
static bool decode(IPC::ArgumentDecoder&, ContextMenuContextData&);
private:
+ WebCore::IntPoint m_menuLocation;
+ Vector<WebKit::WebContextMenuItemData> m_menuItems;
+
WebHitTestResultData m_webHitTestResultData;
String m_selectedText;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191130 => 191131)
--- 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)
@@ -4182,18 +4182,18 @@
}
#if ENABLE(CONTEXT_MENUS)
-void WebPageProxy::showContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, const UserData& userData)
+void WebPageProxy::showContextMenu(const ContextMenuContextData& contextMenuContextData, const UserData& userData)
{
// Showing a context menu runs a nested runloop, which can handle messages that cause |this| to get closed.
Ref<WebPageProxy> protect(*this);
- internalShowContextMenu(menuLocation, contextMenuContextData, proposedItems, ContextMenuClientEligibility::EligibleForClient, userData);
+ internalShowContextMenu(contextMenuContextData, ContextMenuClientEligibility::EligibleForClient, userData);
// No matter the result of internalShowContextMenu, always notify the WebProcess that the menu is hidden so it starts handling mouse events again.
m_process->send(Messages::WebPage::ContextMenuHidden(), m_pageID);
}
-void WebPageProxy::internalShowContextMenu(const IntPoint& menuLocation, const ContextMenuContextData& contextMenuContextData, const Vector<WebContextMenuItemData>& proposedItems, ContextMenuClientEligibility clientEligibility, const UserData& userData)
+void WebPageProxy::internalShowContextMenu(const ContextMenuContextData& contextMenuContextData, ContextMenuClientEligibility clientEligibility, const UserData& userData)
{
m_activeContextMenuContextData = contextMenuContextData;
@@ -4217,7 +4217,7 @@
#endif
Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
- for (auto& item : proposedItems) {
+ for (auto& item : contextMenuContextData.menuItems()) {
if (item.action() != ContextMenuItemTagShareMenu) {
proposedAPIItems.append(WebContextMenuItem::create(item));
continue;
@@ -4235,8 +4235,8 @@
useProposedItems = false;
const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
- if (!m_contextMenuClient->showContextMenu(*this, menuLocation, itemsToShow))
- m_activeContextMenu->showContextMenu(menuLocation, itemsToShow, contextMenuContextData);
+ if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
+ m_activeContextMenu->showContextMenu(contextMenuContextData.menuLocation(), itemsToShow, contextMenuContextData);
m_contextMenuClient->contextMenuDismissed(*this);
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191130 => 191131)
--- 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)
@@ -1266,8 +1266,8 @@
EligibleForClient,
NotEligibleForClient
};
- 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&);
+ void showContextMenu(const ContextMenuContextData&, const UserData&);
+ void internalShowContextMenu(const ContextMenuContextData&, ContextMenuClientEligibility, const UserData&);
WebCore::ContextMenuItem platformInitializeShareMenuItem(const ContextMenuContextData&);
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (191130 => 191131)
--- 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)
@@ -248,7 +248,7 @@
#if ENABLE(CONTEXT_MENUS)
# ContextMenu messages
- ShowContextMenu(WebCore::IntPoint menuLocation, WebKit::ContextMenuContextData contextMenuContextData, Vector<WebKit::WebContextMenuItemData> items, WebKit::UserData userData)
+ ShowContextMenu(WebKit::ContextMenuContextData contextMenuContextData, WebKit::UserData userData)
#endif
# Authentication messages
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (191130 => 191131)
--- 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)
@@ -688,9 +688,9 @@
void WebPageProxy::showSelectionServiceMenu(const IPC::DataReference& selectionAsRTFD, const Vector<String>& telephoneNumbers, bool isEditable, const IntPoint& point)
{
Vector<WebContextMenuItemData> items;
- ContextMenuContextData contextData(selectionAsRTFD.vector(), telephoneNumbers, isEditable);
+ ContextMenuContextData contextData(point, items, selectionAsRTFD.vector(), telephoneNumbers, isEditable);
- internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, UserData());
+ internalShowContextMenu(contextData, ContextMenuClientEligibility::NotEligibleForClient, UserData());
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (191130 => 191131)
--- 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)
@@ -63,11 +63,13 @@
Vector<WebContextMenuItemData> menuItems;
RefPtr<API::Object> userData;
menuItemsWithUserData(menuItems, userData);
- ContextMenuContextData contextMenuContextData(controller.context());
+ auto menuLocation = view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame());
+ ContextMenuContextData contextMenuContextData(menuLocation, menuItems, controller.context());
+
// Mark the WebPage has having a shown context menu then notify the UIProcess.
m_page->contextMenuShowing();
- m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller.hitTestResult().roundedPointInInnerNodeFrame()), contextMenuContextData, menuItems, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
+ m_page->send(Messages::WebPageProxy::ShowContextMenu(contextMenuContextData, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
}
void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
