summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-06-29 22:39:29 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:04:53 +0200
commitd006bbb41d3e5ac3c96cdbf570acd6a2691baa1a (patch)
tree7b0b921b4eb5a706113b90161c16f86a59c48db3
parent8cb68c4fbd51eaf9ea6700d2e9da71755132c8b1 (diff)
downloadqtwebengine-chromium-d006bbb41d3e5ac3c96cdbf570acd6a2691baa1a.tar.gz
<chromium> Do not modify the child path.
We currently only have a single process binary for Qt. Therefore we should not choose a different binary based on required privileges. However, this patch can only be a preliminary solution. May be we should instead implement our own ChildProcessHost. Change-Id: I03af6257c7be04ab09c9828d707d30430961a17c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r--chromium/content/common/child_process_host_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/common/child_process_host_impl.cc b/chromium/content/common/child_process_host_impl.cc
index 1467536ac91..260749655a9 100644
--- a/chromium/content/common/child_process_host_impl.cc
+++ b/chromium/content/common/child_process_host_impl.cc
@@ -107,7 +107,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
if (child_path.empty())
PathService::Get(CHILD_PROCESS_EXE, &child_path);
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && 0
DCHECK(!(flags & CHILD_NO_PIE && flags & CHILD_ALLOW_HEAP_EXECUTION));
// If needed, choose an executable with special flags set that inform the