Diff
Modified: trunk/Source/WebKit2/ChangeLog (148518 => 148519)
--- trunk/Source/WebKit2/ChangeLog 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-16 17:16:12 UTC (rev 148519)
@@ -1,3 +1,27 @@
+2013-04-16 Balazs Kelemen <[email protected]>
+
+ Initialize logging channels for web processes
+ https://bugs.webkit.org/show_bug.cgi?id=114621
+
+ Reviewed by Sam Weinig.
+
+ Use InitializeWebKit2 for initializing the web and plugin processes.
+ It handles initializing the logging channels and it's better to have
+ shared core for this. For the plugin process now we always create
+ a RunLoop object which is not necessary with the -scanPlugin argument
+ but it shouldn't be a problem.
+
+ * PluginProcess/qt/PluginProcessMainQt.cpp:
+ (WebKit::PluginProcessMain):
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+ (WebKit::PluginProcessMainUnix):
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (WebKit::WebProcessMainEfl):
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+ (WebKit::WebProcessMainGtk):
+ * WebProcess/qt/WebProcessMainQt.cpp:
+ (WebKit::WebProcessMainQt):
+
2013-04-16 Michał Pakuła vel Rutka <[email protected]>
[EFL][WK2] Add an API for getting context menu item's parent menu
Modified: trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp (148518 => 148519)
--- trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2013-04-16 17:16:12 UTC (rev 148519)
@@ -30,14 +30,12 @@
#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;
@@ -78,8 +76,7 @@
if (!initializeGtk())
return EXIT_FAILURE;
- JSC::initializeThreading();
- WTF::initializeMainThread();
+ InitializeWebKit2();
if (argc <= 1)
return EXIT_FAILURE;
@@ -93,8 +90,6 @@
return EXIT_SUCCESS;
}
- RunLoop::initializeMainRunLoop();
-
// Create the connection.
bool isNumber = false;
int identifier = app.arguments().at(1).toInt(&isNumber, 10);
Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp (148518 => 148519)
--- trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2013-04-16 17:16:12 UTC (rev 148519)
@@ -33,7 +33,7 @@
#include "Logging.h"
#include "NetscapePlugin.h"
#include "PluginProcess.h"
-#include "ScriptController.h"
+#include "WebKit2Initialize.h"
#include <WebCore/RunLoop.h>
#if PLATFORM(GTK)
#include <gdk/gdkx.h>
@@ -85,7 +85,7 @@
return 1;
#endif
- ScriptController::initializeThreading();
+ InitializeWebKit2();
if (scanPlugin) {
String pluginPath(argv[2]);
@@ -94,8 +94,6 @@
return EXIT_SUCCESS;
}
- RunLoop::initializeMainRunLoop();
-
// Plugins can produce X errors that are handled by the GDK X error handler, which
// exits the process. Since we don't want to crash due to plugin bugs, we install a
// custom error handler to show a warning when a X error happens without aborting.
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (148518 => 148519)
--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2013-04-16 17:16:12 UTC (rev 148519)
@@ -28,6 +28,7 @@
#include "ProxyResolverSoup.h"
#include "WKBase.h"
+#include "WebKit2Initialize.h"
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Edje.h>
@@ -38,10 +39,8 @@
#include <WebCore/RunLoop.h>
#include <WebKit2/WebProcess.h>
#include <libsoup/soup.h>
-#include <runtime/InitializeThreading.h>
#include <runtime/Operations.h>
#include <unistd.h>
-#include <wtf/MainThread.h>
#include <wtf/text/CString.h>
#ifdef HAVE_ECORE_X
@@ -113,11 +112,8 @@
if (!ecore_main_loop_glib_integrate())
return 1;
- JSC::initializeThreading();
- WTF::initializeMainThread();
+ InitializeWebKit2();
- RunLoop::initializeMainRunLoop();
-
SoupSession* session = WebCore::ResourceHandle::defaultSession();
const char* httpProxy = getenv("http_proxy");
if (httpProxy) {
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (148518 => 148519)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2013-04-16 17:16:12 UTC (rev 148519)
@@ -28,6 +28,7 @@
#include "WebProcessMainGtk.h"
#include "WKBase.h"
+#include "WebKit2Initialize.h"
#include <WebCore/AuthenticationChallenge.h>
#include <WebCore/NetworkingContext.h>
#include <WebCore/ResourceHandle.h>
@@ -36,9 +37,7 @@
#include <gtk/gtk.h>
#include <libintl.h>
#include <libsoup/soup.h>
-#include <runtime/InitializeThreading.h>
#include <unistd.h>
-#include <wtf/MainThread.h>
#include <wtf/gobject/GOwnPtr.h>
#include <wtf/gobject/GRefPtr.h>
@@ -60,10 +59,8 @@
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- JSC::initializeThreading();
- WTF::initializeMainThread();
+ InitializeWebKit2();
- RunLoop::initializeMainRunLoop();
int socket = atoi(argv[1]);
ChildProcessInitializationParameters parameters;
Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp (148518 => 148519)
--- trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2013-04-16 17:12:56 UTC (rev 148518)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2013-04-16 17:16:12 UTC (rev 148519)
@@ -29,6 +29,7 @@
#include "config.h"
#include "WebProcess.h"
+#include "WebKit2Initialize.h"
#include <QGuiApplication>
#include <QList>
#include <QNetworkProxyFactory>
@@ -37,8 +38,6 @@
#include <QUrl>
#include <WebCore/RunLoop.h>
#include <errno.h>
-#include <runtime/InitializeThreading.h>
-#include <wtf/MainThread.h>
#if USE(QTKIT)
#include "WebSystemInterface.h"
@@ -211,10 +210,9 @@
}
#endif
initializeProxy();
- JSC::initializeThreading();
- WTF::initializeMainThread();
- RunLoop::initializeMainRunLoop();
+ InitializeWebKit2();
+
#if USE(QTKIT)
InitWebCoreSystemInterfaceForWK2();
#endif
