summaryrefslogtreecommitdiffstats
path: root/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-15 16:08:57 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-15 16:08:57 +0200
commit5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch)
tree8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
parent33b26980cb24288b5a9f2590ccf32a949281bb79 (diff)
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1 widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're working on completing the entire split as part of https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp')
-rw-r--r--Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
index ba22dda2d..f790de1e8 100644
--- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
+++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
@@ -75,6 +75,8 @@ const char* ProcessLauncher::processTypeAsString(ProcessType processType)
return "webprocess";
case PluginProcess:
return "pluginprocess";
+ case NetworkProcess:
+ return "networkprocess";
}
ASSERT_NOT_REACHED();
@@ -93,6 +95,11 @@ bool ProcessLauncher::getProcessTypeFromString(const char* string, ProcessType&
return true;
}
+ if (!strcmp(string, "networkprocess")) {
+ processType = NetworkProcess;
+ return true;
+ }
+
return false;
}