diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp index 0d059a261..e3e1ffdfa 100644 --- a/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp @@ -26,9 +26,11 @@ #include "config.h" #include "PluginProcessCreationParameters.h" -#if ENABLE(PLUGIN_PROCESS) - -#include "ArgumentCoders.h" +#if ENABLE(NETSCAPE_PLUGIN_API) +#if PLATFORM(COCOA) +#include "ArgumentCodersCF.h" +#endif +#include "WebCoreArgumentCoders.h" namespace WebKit { @@ -37,18 +39,21 @@ PluginProcessCreationParameters::PluginProcessCreationParameters() { } -void PluginProcessCreationParameters::encode(CoreIPC::ArgumentEncoder& encoder) const +void PluginProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const { encoder.encodeEnum(processType); encoder << supportsAsynchronousPluginInitialization; encoder << minimumLifetime; encoder << terminationTimeout; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) encoder << acceleratedCompositingPort; +#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + IPC::encode(encoder, networkATSContext.get()); +#endif #endif } -bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result) +bool PluginProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginProcessCreationParameters& result) { if (!decoder.decodeEnum(result.processType)) return false; @@ -58,9 +63,13 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, return false; if (!decoder.decode(result.terminationTimeout)) return false; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) if (!decoder.decode(result.acceleratedCompositingPort)) return false; +#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) + if (!IPC::decode(decoder, result.networkATSContext)) + return false; +#endif #endif return true; @@ -69,4 +78,4 @@ bool PluginProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, } // namespace WebKit -#endif // ENABLE(PLUGIN_PROCESS) +#endif // ENABLE(NETSCAPE_PLUGIN_API) |