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

1 files changed, 14 insertions, 0 deletions

diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
index ba22dda2d..771a6eef7 100644
--- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
+++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
@@ -75,6 +75,10 @@ const char* ProcessLauncher::processTypeAsString(ProcessType processType)
         return "webprocess";
     case PluginProcess:
         return "pluginprocess";
+    case NetworkProcess:
+        return "networkprocess";
+    case SharedWorkerProcess:
+        return "sharedworkerprocess";
     }
 
     ASSERT_NOT_REACHED();
@@ -93,6 +97,16 @@ bool ProcessLauncher::getProcessTypeFromString(const char* string, ProcessType&
         return true;
     }
 
+    if (!strcmp(string, "networkprocess")) {
+        processType = NetworkProcess;
+        return true;
+    }
+
+    if (!strcmp(string, "sharedworkerprocess")) {
+        processType = SharedWorkerProcess;
+        return true;
+    }
+
     return false;
 }