From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebKit2/Shared/PlatformPopupMenuData.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/Shared/PlatformPopupMenuData.cpp') 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); -- cgit v1.2.1