diff options
| author | vitalybuka <vitalybuka@chromium.org> | 2015-04-03 10:14:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-03 17:15:29 +0000 |
| commit | 1a16f9bf016a616d12be7003ebe84fb1aebc748e (patch) | |
| tree | bbdf3b094570252e91c8443d9b831269ba097776 /content/app/content_main_runner.cc | |
| parent | 6839912f0cadd648c11cdf50f8dde98be6fffd3a (diff) | |
| download | chromium_src-1a16f9bf016a616d12be7003ebe84fb1aebc748e.zip chromium_src-1a16f9bf016a616d12be7003ebe84fb1aebc748e.tar.gz chromium_src-1a16f9bf016a616d12be7003ebe84fb1aebc748e.tar.bz2 | |
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}
Diffstat (limited to 'content/app/content_main_runner.cc')
| -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 43c0d00..7c8e7eb 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -703,7 +703,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); |