diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-06-29 22:41:34 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-07-02 10:58:52 +0200 |
| commit | 9f16a61146ac5018c55dbe70926d921e3d0af4d1 (patch) | |
| tree | a9bf527f3d1fe8ac236f99c3cb35a1735098544d /patches | |
| parent | 117e6b34ace2efc049d7e90de79f628a98d7eb65 (diff) | |
[Mac] 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: I0e76ff44f474842c7a96317a05f9964782f68080
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-Mac-Do-not-modify-the-child-path.patch | 29 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/0001-Mac-Do-not-modify-the-child-path.patch b/patches/0001-Mac-Do-not-modify-the-child-path.patch new file mode 100644 index 000000000..c4b538e6a --- /dev/null +++ b/patches/0001-Mac-Do-not-modify-the-child-path.patch @@ -0,0 +1,29 @@ +From 19d0958dc151847b994c352fdffd2844bec20b43 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Sat, 29 Jun 2013 22:39:29 +0200 +Subject: [PATCH] [Mac] 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. +--- + content/common/child_process_host_impl.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc +index 2dfab2f..3f53266 100644 +--- a/content/common/child_process_host_impl.cc ++++ b/content/common/child_process_host_impl.cc +@@ -106,7 +106,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 +-- +1.7.12.4 (Apple Git-37) + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index f671d847c..6d39e87b6 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -65,6 +65,7 @@ git am $PATCH_DIR/0001-My-local-fixes.patch git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch +git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" |