diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
| commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
| tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
| download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz | |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
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) |