Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 10 insertions, 7 deletions

diff --git a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
index 87c9940a5..bc884b962 100644
--- a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp
@@ -38,9 +38,11 @@ void Plugin::Parameters::encode(CoreIPC::ArgumentEncoder* encoder) const
     encoder->encode(names);
     encoder->encode(values);
     encoder->encode(mimeType);
-    encoder->encode(loadManually);
-    encoder->encode(documentURL);
-    encoder->encode(toplevelDocumentURL);
+    encoder->encode(isFullFramePlugin);
+    encoder->encode(shouldUseManualLoader);
+#if PLATFORM(MAC)
+    encoder->encodeEnum(layerHostingMode);
+#endif
 }
 
 bool Plugin::Parameters::decode(CoreIPC::ArgumentDecoder* decoder, Parameters& parameters)
@@ -57,13 +59,14 @@ bool Plugin::Parameters::decode(CoreIPC::ArgumentDecoder* decoder, Parameters& p
         return false;
     if (!decoder->decode(parameters.mimeType))
         return false;
-    if (!decoder->decode(parameters.loadManually))
+    if (!decoder->decode(parameters.isFullFramePlugin))
         return false;
-    if (!decoder->decode(parameters.documentURL))
+    if (!decoder->decode(parameters.shouldUseManualLoader))
         return false;
-    if (!decoder->decode(parameters.toplevelDocumentURL))
+#if PLATFORM(MAC)
+    if (!decoder->decodeEnum(parameters.layerHostingMode))
         return false;
-
+#endif
     if (parameters.names.size() != parameters.values.size()) {
         decoder->markInvalid();
         return false;