From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebKit2/Shared/WebContextMenuItemData.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'Source/WebKit2/Shared/WebContextMenuItemData.cpp')

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;
 }
-- 
cgit v1.2.1