From 43a42f108af6bcbd91f2672731c3047c26213af1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Mon, 22 Oct 2012 15:40:17 +0200
Subject: Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49
 (http://svn.webkit.org/repository/webkit/trunk@132067)

New snapshot that fixes build without QtWidgets
---
 Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp')

diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
index 771a6eef7..ee4e3c38b 100644
--- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
+++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -73,12 +73,16 @@ const char* ProcessLauncher::processTypeAsString(ProcessType processType)
     switch (processType) {
     case WebProcess:
         return "webprocess";
+#if ENABLE(PLUGIN_PROCESS)
     case PluginProcess:
         return "pluginprocess";
+#endif
     case NetworkProcess:
         return "networkprocess";
+#if ENABLE(SHARED_WORKER_PROCESS)
     case SharedWorkerProcess:
         return "sharedworkerprocess";
+#endif
     }
 
     ASSERT_NOT_REACHED();
@@ -92,20 +96,24 @@ bool ProcessLauncher::getProcessTypeFromString(const char* string, ProcessType&
         return true;
     }
 
+#if ENABLE(PLUGIN_PROCESS)
     if (!strcmp(string, "pluginprocess")) {
         processType = PluginProcess;
         return true;
     }
+#endif
 
     if (!strcmp(string, "networkprocess")) {
         processType = NetworkProcess;
         return true;
     }
 
+#if ENABLE(SHARED_WORKER_PROCESS)
     if (!strcmp(string, "sharedworkerprocess")) {
         processType = SharedWorkerProcess;
         return true;
     }
+#endif
 
     return false;
 }
-- 
cgit v1.2.1