diff options
| author | Vitaly Buka <vitalybuka@chromium.org> | 2015-04-06 16:49:14 -0700 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@chromium.org> | 2015-04-06 23:51:05 +0000 |
| commit | 45358ee677ce70ec9b6c7f509c616fca03d7500c (patch) | |
| tree | 0522f616584c113c94cc5fd720c52f3c972c0f8d | |
| parent | dec9415909fc0866af39a99fd7b559eb28230992 (diff) | |
| download | chromium_src-45358ee677ce70ec9b6c7f509c616fca03d7500c.zip chromium_src-45358ee677ce70ec9b6c7f509c616fca03d7500c.tar.gz chromium_src-45358ee677ce70ec9b6c7f509c616fca03d7500c.tar.bz2 | |
Merge: Don't crash service process on start initializing V8
https://codereview.chromium.org/944913002 wrongly assumes that
non empty --type means a child process.
This is a quick fix for merging into Chrome 42. We need better solution for 43. Content does not know about "service" process and does not include "service" constant from chrome.
BUG=466917
Review URL: https://codereview.chromium.org/1055413002
Cr-Commit-Position: refs/heads/master@{#323758}
(cherry picked from commit 1a16f9bf016a616d12be7003ebe84fb1aebc748e)
Review URL: https://codereview.chromium.org/1065723004
Cr-Commit-Position: refs/branch-heads/2311@{#438}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
| -rw-r--r-- | content/app/content_main_runner.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 8229e3c..619dbfe 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -697,7 +697,8 @@ class ContentMainRunnerImpl : public ContentMainRunner { // kV8NativesDataDescriptor and kV8SnapshotDataDescriptor are shared with // child processes. On Android they are set in // ChildProcessService::InternalInitChildProcess, otherwise set them here. - if (!process_type.empty() && process_type != switches::kZygoteProcess) { + if (!process_type.empty() && process_type != switches::kZygoteProcess + && process_type != "service") { g_fds->Set( kV8NativesDataDescriptor, kV8NativesDataDescriptor + base::GlobalDescriptors::kBaseDescriptor); |