diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-07-05 21:58:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-09 13:47:30 +0200 |
| commit | ea1e55ad0f2ae04706c0103e6f613c253cfcb094 (patch) | |
| tree | f1335c4310797dd9f412a4bd9fed449b6dab1710 /patches | |
| parent | 1daab3653e56469868656b32fa87b7f9585ec577 (diff) | |
Get rid of or upstream chrome_path patch for zygote
Override base::FILE_EXE in ContentMainDelegateQt::PreSandboxStartup()
with the path to our child process and get rid of the command line
argument and the content::CHILD_PROCESS_EXE override.
This reduces 0001-My-local-fixes.patch to export ContentMainRunner
so the patch can be renamed to better reflect it's purpose.
This hunk is still needed since we need to access ContentMainRunner's
Initialize() to set our ContentMainDelegate.
Change-Id: I808cb114100300a33f8cb1b154c6cde89cbf5d98
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-Export-ContentMainRunner.patch (renamed from patches/0001-My-local-fixes.patch) | 16 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/patches/0001-My-local-fixes.patch b/patches/0001-Export-ContentMainRunner.patch index ab9e927d7..7cd402485 100644 --- a/patches/0001-My-local-fixes.patch +++ b/patches/0001-Export-ContentMainRunner.patch @@ -1,26 +1,12 @@ From 0a3b4029af83089cb313b555a47c5c510dc94cc7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann <simon.hausmann@digia.com> Date: Mon, 29 Apr 2013 11:25:37 +0200 -Subject: [PATCH 1/2] My local fixes +Subject: Export ContentMainRunner --- - content/browser/zygote_host/zygote_host_impl_linux.cc | 1 + content/public/app/content_main_runner.h | 3 ++- - content/public/common/content_client.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index ba7884f8..50eacc8 100644 ---- a/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -70,6 +70,7 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - - base::FilePath chrome_path; - CHECK(PathService::Get(base::FILE_EXE, &chrome_path)); -+ chrome_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(switches::kBrowserSubprocessPath); - CommandLine cmd_line(chrome_path); - - cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess); diff --git a/content/public/app/content_main_runner.h b/content/public/app/content_main_runner.h index bed5ff2..992e0d0 100644 --- a/content/public/app/content_main_runner.h diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 6bc1c5e05..0ffe6860f 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -61,7 +61,7 @@ git submodule update --recursive cd $CHROMIUM_SRC_DIR echo "Entering $PWD" -git am $PATCH_DIR/0001-My-local-fixes.patch +git am $PATCH_DIR/0001-Export-ContentMainRunner.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 |