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

2 files changed, 13 insertions, 2 deletions

diff --git a/Source/WebKit2/PluginProcess/gtk/PluginControllerProxyGtk.cpp b/Source/WebKit2/PluginProcess/gtk/PluginControllerProxyGtk.cpp
index 28304df2a..cbcc1d730 100644
--- a/Source/WebKit2/PluginProcess/gtk/PluginControllerProxyGtk.cpp
+++ b/Source/WebKit2/PluginProcess/gtk/PluginControllerProxyGtk.cpp
@@ -34,7 +34,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-void PluginControllerProxy::platformInitialize()
+void PluginControllerProxy::platformInitialize(const PluginCreationParameters&)
 {
     notImplemented();
 }
diff --git a/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp b/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp
index 992d74075..870c01c27 100644
--- a/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp
+++ b/Source/WebKit2/PluginProcess/gtk/PluginProcessMainGtk.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "PluginProcessMainGtk.h"
 
+#include "NetscapePlugin.h"
 #include "PluginProcess.h"
 #include <WebCore/RunLoop.h>
 #include <gdk/gdkx.h>
@@ -53,12 +54,22 @@ static int webkitgtkXError(Display* xdisplay, XErrorEvent* error)
 
 WK_EXPORT int PluginProcessMainGtk(int argc, char* argv[])
 {
-    ASSERT(argc == 2);
+    ASSERT(argc == 2 || argc == 3);
+    bool scanPlugin = !strcmp(argv[1], "-scanPlugin");
+    ASSERT(argc == 2 || (argc == 3 && scanPlugin));
 
     gtk_init(&argc, &argv);
 
     JSC::initializeThreading();
     WTF::initializeMainThread();
+
+    if (scanPlugin) {
+        String pluginPath(argv[2]);
+        if (!NetscapePluginModule::scanPlugin(pluginPath))
+            return EXIT_FAILURE;
+        return EXIT_SUCCESS;
+    }
+
     RunLoop::initializeMainRunLoop();
 
     // Plugins can produce X errors that are handled by the GDK X error handler, which