From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Fri, 13 Sep 2013 12:51:20 +0200
Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
---
 Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp')

diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
index ac6f2c1bd..8de65216b 100644
--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
@@ -27,18 +27,15 @@
 #include "config.h"
 
 #if ENABLE(PLUGIN_PROCESS)
-#include "PluginProcessMain.h"
 
 #include "NetscapePluginModule.h"
 #include "PluginProcess.h"
+#include "WebKit2Initialize.h"
 #include <QDebug>
 #include <QGuiApplication>
 #include <QStringList>
 #include <QtGlobal>
 #include <WebCore/RunLoop.h>
-#include <runtime/InitializeThreading.h>
-#include <wtf/MainThread.h>
-#include <wtf/Threading.h>
 
 using namespace WebCore;
 
@@ -79,8 +76,7 @@ Q_DECL_EXPORT int PluginProcessMain(int argc, char** argv)
     if (!initializeGtk())
         return EXIT_FAILURE;
 
-    JSC::initializeThreading();
-    WTF::initializeMainThread();
+    InitializeWebKit2();
 
     if (argc <= 1)
         return EXIT_FAILURE;
@@ -94,14 +90,17 @@ Q_DECL_EXPORT int PluginProcessMain(int argc, char** argv)
         return EXIT_SUCCESS;
     }
 
-    RunLoop::initializeMainRunLoop();
-
     // Create the connection.
     bool isNumber = false;
     int identifier = app.arguments().at(1).toInt(&isNumber, 10);
     if (!isNumber)
         return EXIT_FAILURE;
-    WebKit::PluginProcess::shared().initialize(identifier, RunLoop::main());
+
+    WebKit::ChildProcessInitializationParameters parameters;
+    parameters.connectionIdentifier = identifier;
+    parameters.extraInitializationData.add("plugin-path", app.arguments().at(2));
+
+    WebKit::PluginProcess::shared().initialize(parameters);
 
     RunLoop::run();
 
-- 
cgit v1.2.1