diff options
| author | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 04:41:57 +0000 |
|---|---|---|
| committer | hamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 04:41:57 +0000 |
| commit | 1154765f5b5c6a2aefa778fd80d8230c09c39221 (patch) | |
| tree | 91ea5446c7c9cead59a13de9e242909df3dc8395 /chrome/app | |
| parent | 16f013d39846a4dccd918c640dced866b832af10 (diff) | |
| download | chromium_src-1154765f5b5c6a2aefa778fd80d8230c09c39221.zip chromium_src-1154765f5b5c6a2aefa778fd80d8230c09c39221.tar.gz chromium_src-1154765f5b5c6a2aefa778fd80d8230c09c39221.tar.bz2 | |
Tell nacl_helper to use non SFI mode in HandleForkRequest
Before this patch, we were passing this info by the first IPC
to nacl_helper (NaClProcessMsg_Start). This timing is too late
for seccomp sandbox initialization.
This patch introduces a new process type, nacl-loader-nonsfi.
For now, nacl_helper says it can handle both nacl-loader and
nacl-loader-nonsfi. Once we have splitted nacl_helper into two
binaries, we will probably create two NaClForkDelegate
instances and let each of them to focus on a single process
type.
Also removed uses_nonsfi_mode from NaClStartParams. This is
unnecessary anymore.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
TEST=out/Release/browser_tests --gtest_filter='NaCl*' and trybot
R=jln@chromium.org, jochen@chromium.org, mseaborn@chromium.org
Review URL: https://codereview.chromium.org/216603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index c5f62a8..1aad625 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -199,7 +199,8 @@ static void AdjustLinuxOOMScore(const std::string& process_type) { process_type == switches::kServiceProcess) { score = kMiscScore; #ifndef DISABLE_NACL - } else if (process_type == switches::kNaClLoaderProcess) { + } else if (process_type == switches::kNaClLoaderProcess || + process_type == switches::kNaClLoaderNonSfiProcess) { score = kPluginScore; #endif } else if (process_type == switches::kZygoteProcess || |