Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 10 insertions, 7 deletions

diff --git a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
index 1550393f3..72ae78c40 100644
--- a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
+++ b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
@@ -31,17 +31,16 @@
 namespace WebKit {
 
 PlatformPopupMenuData::PlatformPopupMenuData()
-#if PLATFORM(QT)
-    : multipleSelections(false)
-#endif
 {
 }
 
-void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
+void PlatformPopupMenuData::encode(IPC::ArgumentEncoder& encoder) const
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     encoder << fontInfo;
     encoder << shouldPopOver;
+    encoder << hideArrows;
+    encoder.encodeEnum(menuSize);
 #elif PLATFORM(QT)
     encoder << multipleSelections;
 #else
@@ -49,13 +48,17 @@ void PlatformPopupMenuData::encode(CoreIPC::ArgumentEncoder& encoder) const
 #endif
 }
 
-bool PlatformPopupMenuData::decode(CoreIPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
+bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (!decoder.decode(data.fontInfo))
         return false;
     if (!decoder.decode(data.shouldPopOver))
         return false;
+    if (!decoder.decode(data.hideArrows))
+        return false;
+    if (!decoder.decodeEnum(data.menuSize))
+        return false;
 #elif PLATFORM(QT)
     if (!decoder.decode(data.multipleSelections))
         return false;