summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_process_host.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 05:15:42 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 05:15:42 +0000
commit7c4ea146bc033d89c1a0d527ae3d43b587a23cab (patch)
tree293c4da0b8fa44e5d4939c410434c51c8ffb872c /chrome/browser/plugin_process_host.cc
parent877cbee0688984a2a00ce074f981bdfb1e42abfa (diff)
downloadchromium_src-7c4ea146bc033d89c1a0d527ae3d43b587a23cab.zip
chromium_src-7c4ea146bc033d89c1a0d527ae3d43b587a23cab.tar.gz
chromium_src-7c4ea146bc033d89c1a0d527ae3d43b587a23cab.tar.bz2
Create initial GPU backing store in the GPU process for X windows applications.
This gets the window from the RenderWidgetHostViewGtk and just does OpenGL calls directly into it. There are a lot of bugs, especially around expose events, which aren't really processed at all, and also tab teardown and reparenting. The new backing store defaults to off. This does some refactoring of the existing Windows GPU process backing store implementation to make some of it sharable by this Linux verion. This removes some previously defunct in-process GL backing store code and moves it to the GPU process. This patch does some refactoring around how child processes are created using zygoes or not. I found there were many places where a command line would be checked with special logic to know whether to enable zygote code or not. I tried to unify this so it could be computed once for each process type. This is what most of the changed files in chrome/browser are related to. BUG=none TEST=none Review URL: http://codereview.chromium.org/548112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.cc')
-rw-r--r--chrome/browser/plugin_process_host.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index afc2486..ea47444 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -336,9 +336,12 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
if (!CreateChannel())
return false;
- // Build command line for plugin, we have to quote the plugin's path to deal
- // with spaces.
- FilePath exe_path = GetChildPath();
+ // Build command line for plugin. When we have a plugin launcher, we can't
+ // allow "self" on linux and we need the real file path.
+ const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+ std::wstring plugin_launcher =
+ browser_command_line.GetSwitchValue(switches::kPluginLauncher);
+ FilePath exe_path = GetChildPath(plugin_launcher.empty());
if (exe_path.empty())
return false;
@@ -379,8 +382,6 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
#endif
};
- const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
-
for (size_t i = 0; i < arraysize(switch_names); ++i) {
if (browser_command_line.HasSwitch(switch_names[i])) {
cmd_line->AppendSwitchWithValue(
@@ -390,8 +391,6 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
}
// If specified, prepend a launcher program to the command line.
- std::wstring plugin_launcher =
- browser_command_line.GetSwitchValue(switches::kPluginLauncher);
if (!plugin_launcher.empty())
cmd_line->PrependWrapper(plugin_launcher);
@@ -434,6 +433,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
#if defined(OS_WIN)
FilePath(),
#elif defined(OS_POSIX)
+ false,
env,
#endif
cmd_line);