diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebKit2/Shared/WebContextMenuItemData.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebKit2/Shared/WebContextMenuItemData.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebContextMenuItemData.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Source/WebKit2/Shared/WebContextMenuItemData.cpp b/Source/WebKit2/Shared/WebContextMenuItemData.cpp index d659e9c6c..2ae8d1c01 100644 --- a/Source/WebKit2/Shared/WebContextMenuItemData.cpp +++ b/Source/WebKit2/Shared/WebContextMenuItemData.cpp @@ -31,7 +31,6 @@ #include "APIObject.h" #include "ArgumentCoders.h" -#include "Arguments.h" #include <wtf/text/CString.h> #include <WebCore/ContextMenu.h> @@ -67,18 +66,14 @@ WebContextMenuItemData::WebContextMenuItemData(WebCore::ContextMenuAction action { } -WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item, WebCore::ContextMenu* menu) +WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item) : m_type(item.type()) , m_action(item.action()) , m_title(item.title()) { if (m_type == WebCore::SubmenuType) { -#if USE(CROSS_PLATFORM_CONTEXT_MENUS) const Vector<WebCore::ContextMenuItem>& coreSubmenu = item.subMenuItems(); -#else - Vector<WebCore::ContextMenuItem> coreSubmenu = WebCore::contextMenuItemVector(item.platformSubMenu()); -#endif - m_submenu = kitItems(coreSubmenu, menu); + m_submenu = kitItems(coreSubmenu); } m_enabled = item.enabled(); @@ -104,7 +99,7 @@ void WebContextMenuItemData::setUserData(API::Object* userData) m_userData = userData; } -void WebContextMenuItemData::encode(IPC::ArgumentEncoder& encoder) const +void WebContextMenuItemData::encode(IPC::Encoder& encoder) const { encoder.encodeEnum(m_type); encoder.encodeEnum(m_action); @@ -114,7 +109,7 @@ void WebContextMenuItemData::encode(IPC::ArgumentEncoder& encoder) const encoder << m_submenu; } -bool WebContextMenuItemData::decode(IPC::ArgumentDecoder& decoder, WebContextMenuItemData& item) +bool WebContextMenuItemData::decode(IPC::Decoder& decoder, WebContextMenuItemData& item) { WebCore::ContextMenuItemType type; if (!decoder.decodeEnum(type)) @@ -157,12 +152,12 @@ bool WebContextMenuItemData::decode(IPC::ArgumentDecoder& decoder, WebContextMen return true; } -Vector<WebContextMenuItemData> kitItems(const Vector<WebCore::ContextMenuItem>& coreItemVector, WebCore::ContextMenu* menu) +Vector<WebContextMenuItemData> kitItems(const Vector<WebCore::ContextMenuItem>& coreItemVector) { Vector<WebContextMenuItemData> result; result.reserveCapacity(coreItemVector.size()); for (unsigned i = 0; i < coreItemVector.size(); ++i) - result.append(WebContextMenuItemData(coreItemVector[i], menu)); + result.append(WebContextMenuItemData(coreItemVector[i])); return result; } |