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/PluginProcess/PluginCreationParameters.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/PluginProcess/PluginCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginCreationParameters.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp index 409106a49..96a6166cc 100644 --- a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp +++ b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "PluginCreationParameters.h" -#if ENABLE(PLUGIN_PROCESS) +#if ENABLE(NETSCAPE_PLUGIN_API) #include "ArgumentCoders.h" @@ -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(CoreIPC::ArgumentEncoder& encoder) const +void PluginCreationParameters::encode(IPC::ArgumentEncoder& encoder) const { encoder << pluginInstanceID; encoder << windowNPObjectID; @@ -53,15 +52,13 @@ void PluginCreationParameters::encode(CoreIPC::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(CoreIPC::ArgumentDecoder& decoder, PluginCreationParameters& result) +bool PluginCreationParameters::decode(IPC::ArgumentDecoder& decoder, PluginCreationParameters& result) { if (!decoder.decode(result.pluginInstanceID) || !result.pluginInstanceID) return false; @@ -81,16 +78,17 @@ bool PluginCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginC 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; } @@ -98,4 +96,4 @@ bool PluginCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, PluginC } // namespace WebKit -#endif // ENABLE(PLUGIN_PROCESS) +#endif // ENABLE(NETSCAPE_PLUGIN_API) |