diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebKit2/PluginProcess/PluginCreationParameters.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginCreationParameters.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp index 3d2492f96..ec27eed74 100644 --- a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp +++ b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp @@ -37,15 +37,14 @@ PluginCreationParameters::PluginCreationParameters() , windowNPObjectID(0) , contentsScaleFactor(1) , isPrivateBrowsingEnabled(false) + , isMuted(false) , asynchronousCreationIncomplete(false) , artificialPluginInitializationDelayEnabled(false) -#if USE(ACCELERATED_COMPOSITING) , isAcceleratedCompositingEnabled(false) -#endif { } -void PluginCreationParameters::encode(IPC::ArgumentEncoder& encoder) const +void PluginCreationParameters::encode(IPC::Encoder& encoder) const { encoder << pluginInstanceID; encoder << windowNPObjectID; @@ -53,15 +52,13 @@ void PluginCreationParameters::encode(IPC::ArgumentEncoder& encoder) const encoder << userAgent; encoder << contentsScaleFactor; encoder << isPrivateBrowsingEnabled; + encoder << isMuted; encoder << asynchronousCreationIncomplete; encoder << artificialPluginInitializationDelayEnabled; - -#if USE(ACCELERATED_COMPOSITING) encoder << isAcceleratedCompositingEnabled; -#endif } -bool PluginCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginCreationParameters& result) +bool PluginCreationParameters::decode(IPC::Decoder& decoder, PluginCreationParameters& result) { if (!decoder.decode(result.pluginInstanceID) || !result.pluginInstanceID) return false; @@ -81,16 +78,17 @@ bool PluginCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginCreat if (!decoder.decode(result.isPrivateBrowsingEnabled)) return false; + if (!decoder.decode(result.isMuted)) + return false; + if (!decoder.decode(result.asynchronousCreationIncomplete)) return false; if (!decoder.decode(result.artificialPluginInitializationDelayEnabled)) return false; -#if USE(ACCELERATED_COMPOSITING) if (!decoder.decode(result.isAcceleratedCompositingEnabled)) return false; -#endif return true; } |