diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit2/WebProcess/WebKitMain.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
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
Diffstat (limited to 'Source/WebKit2/WebProcess/WebKitMain.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebKitMain.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
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) @@ -54,6 +62,16 @@ static int WebKitMain(const CommandLine& 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 } return EXIT_FAILURE; |