diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 06:48:46 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 06:48:46 +0000 |
| commit | c149f3b443acffe9924cb92c62d6adeb92c1d145 (patch) | |
| tree | 51776b80c36a148fb2f2e7aa287887eef1992a29 /chrome | |
| parent | 33390ab9accc8f503a7b37b6b1533b491de2414f (diff) | |
| download | chromium_src-c149f3b443acffe9924cb92c62d6adeb92c1d145.zip chromium_src-c149f3b443acffe9924cb92c62d6adeb92c1d145.tar.gz chromium_src-c149f3b443acffe9924cb92c62d6adeb92c1d145.tar.bz2 | |
Make the PPAPI plugin process actually run on Linux by properly hooking up the zygote.
Review URL: http://codereview.chromium.org/4843001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ppapi_plugin_process_host.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 43786c9..867bb01 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -821,6 +821,8 @@ int ChromeMain(int argc, char** argv) { #endif } else if (process_type == switches::kWorkerProcess) { rv = WorkerMain(main_params); + } else if (process_type == switches::kPpapiPluginProcess) { + rv = PpapiPluginMain(main_params); } else { NOTREACHED() << "Unknown process type: " << process_type; } diff --git a/chrome/browser/ppapi_plugin_process_host.cc b/chrome/browser/ppapi_plugin_process_host.cc index 8adbd30..ba47b86 100644 --- a/chrome/browser/ppapi_plugin_process_host.cc +++ b/chrome/browser/ppapi_plugin_process_host.cc @@ -51,11 +51,14 @@ void PpapiPluginProcessHost::Init(const FilePath& path, if (!plugin_launcher.empty()) cmd_line->PrependWrapper(plugin_launcher); + // On posix, having a plugin launcher means we need to use another process + // instead of just forking the zygote. Launch( #if defined(OS_WIN) FilePath(), #elif defined(OS_POSIX) - true, base::environment_vector(), + plugin_launcher.empty(), + base::environment_vector(), #endif cmd_line); } |