diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 20:34:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 20:34:31 +0000 |
| commit | 0e2f87584666a6db6054bbe45905b9c7194bcc6a (patch) | |
| tree | fa8306c96b997eaf6fb17da5db11a187149b3100 /chrome/renderer | |
| parent | 5af903766e619588dc04838a25b9d8b920b807d0 (diff) | |
| download | chromium_src-0e2f87584666a6db6054bbe45905b9c7194bcc6a.zip chromium_src-0e2f87584666a6db6054bbe45905b9c7194bcc6a.tar.gz chromium_src-0e2f87584666a6db6054bbe45905b9c7194bcc6a.tar.bz2 | |
linux: make --single-process mean in-process renderer.
Since we can't have in-process plugins on Linux, let's make
single-process do as much of a single process as possible.
The alternative is detecting and erroring out on --single-process, then
adding a new flag and changing all of the other code that currently
examines --single-process to examine both the new flag and
--single-process. That seems like a lot of extra code and source of
potential error.
Note that we print out a warning indicating this on --single-process
in the LINUX case.
Review URL: http://codereview.chromium.org/100053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_process.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index 6cd9b68..c6ac565 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -116,8 +116,16 @@ void RenderProcess::Init() { bool RenderProcess::InProcessPlugins() { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); +#if defined(OS_LINUX) + // Plugin processes require a UI message loop, and the Linux message loop + // implementation only allows one UI loop per process. + if (command_line.HasSwitch(switches::kInProcessPlugins)) + NOTIMPLEMENTED() << ": in process plugins not supported on Linux"; + return command_line.HasSwitch(switches::kInProcessPlugins); +#else return command_line.HasSwitch(switches::kInProcessPlugins) || command_line.HasSwitch(switches::kSingleProcess); +#endif } // ----------------------------------------------------------------------------- |