From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 17 Oct 2012 16:21:14 +0200
Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00
 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
---
 Source/WebKit2/WebProcess/WebKitMain.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'Source/WebKit2/WebProcess/WebKitMain.cpp')

diff --git a/Source/WebKit2/WebProcess/WebKitMain.cpp b/Source/WebKit2/WebProcess/WebKitMain.cpp
index 03a8cb5c5..706dad256 100644
--- a/Source/WebKit2/WebProcess/WebKitMain.cpp
+++ b/Source/WebKit2/WebProcess/WebKitMain.cpp
@@ -31,6 +31,14 @@
 #include "WebProcessMain.h"
 #include <wtf/text/CString.h>
 
+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMain.h"
+#endif
+
+#if ENABLE(SHARED_WORKER_PROCESS)
+#include "SharedWorkerProcessMain.h"
+#endif
+
 #if PLATFORM(MAC)
 #include <objc/objc-auto.h>
 #elif PLATFORM(WIN)
@@ -53,6 +61,16 @@ static int WebKitMain(const CommandLine& commandLine)
             return PluginProcessMain(commandLine);
 #else
             break;
+#endif
+        case ProcessLauncher::NetworkProcess:
+#if ENABLE(NETWORK_PROCESS)
+            return NetworkProcessMain(commandLine);
+#else
+            break;
+#endif
+#if ENABLE(SHARED_WORKER_PROCESS)
+        case ProcessLauncher::SharedWorkerProcess:
+            return SharedWorkerProcessMain(commandLine);
 #endif
     }
 
-- 
cgit v1.2.1