webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 4 deletions

diff --git a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
index 49da13012..efa7976b1 100644
--- a/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
+++ b/Source/WebKit2/Shared/PlatformPopupMenuData.cpp
@@ -34,23 +34,29 @@ PlatformPopupMenuData::PlatformPopupMenuData()
 {
 }
 
-void PlatformPopupMenuData::encode(IPC::ArgumentEncoder& encoder) const
+void PlatformPopupMenuData::encode(IPC::Encoder& encoder) const
 {
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     encoder << fontInfo;
     encoder << shouldPopOver;
+    encoder << hideArrows;
+    encoder.encodeEnum(menuSize);
 #else
     UNUSED_PARAM(encoder);
 #endif
 }
 
-bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
+bool PlatformPopupMenuData::decode(IPC::Decoder& 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;
 #else
     UNUSED_PARAM(decoder);
     UNUSED_PARAM(data);