Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)

New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
index e29e9744c..bc2e9929c 100644
--- a/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
+++ b/Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
@@ -37,6 +37,8 @@ PluginCreationParameters::PluginCreationParameters()
     , windowNPObjectID(0)
     , contentsScaleFactor(1)
     , isPrivateBrowsingEnabled(false)
+    , asynchronousCreationIncomplete(false)
+    , artificialPluginInitializationDelayEnabled(false)
 #if USE(ACCELERATED_COMPOSITING)
     , isAcceleratedCompositingEnabled(false)
 #endif
@@ -51,6 +53,8 @@ void PluginCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const
     encoder->encode(userAgent);
     encoder->encode(contentsScaleFactor);
     encoder->encode(isPrivateBrowsingEnabled);
+    encoder->encode(asynchronousCreationIncomplete);
+    encoder->encode(artificialPluginInitializationDelayEnabled);
 
 #if USE(ACCELERATED_COMPOSITING)
     encoder->encode(isAcceleratedCompositingEnabled);
@@ -77,6 +81,12 @@ bool PluginCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, PluginC
     if (!decoder->decode(result.isPrivateBrowsingEnabled))
         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;