summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_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/gpu_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/gpu_process_host.cc')
-rw-r--r--chrome/browser/gpu_process_host.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc
index c56be79..e35cdd9 100644
--- a/chrome/browser/gpu_process_host.cc
+++ b/chrome/browser/gpu_process_host.cc
@@ -17,7 +17,11 @@
#include "ipc/ipc_switches.h"
GpuProcessHost::GpuProcessHost() : last_routing_id_(1) {
- FilePath exe_path = ChildProcessHost::GetChildPath();
+ const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+ std::wstring gpu_launcher =
+ browser_command_line.GetSwitchValue(switches::kGpuLauncher);
+
+ FilePath exe_path = ChildProcessHost::GetChildPath(gpu_launcher.empty());
if (exe_path.empty())
return;
@@ -35,11 +39,16 @@ GpuProcessHost::GpuProcessHost() : last_routing_id_(1) {
cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
ASCIIToWide(channel_id));
+ // If specified, prepend a launcher program to the command line.
+ if (!gpu_launcher.empty())
+ cmd_line->PrependWrapper(gpu_launcher);
+
// Spawn the child process asynchronously to avoid blocking the UI thread.
child_process_.reset(new ChildProcessLauncher(
#if defined(OS_WIN)
FilePath(),
#elif defined(POSIX)
+ false, // Never use the zygote (GPU plugin can't be sandboxed).
base::environment_vector(),
channel_->GetClientFileDescriptor(),
#endif
@@ -62,7 +71,7 @@ int32 GpuProcessHost::GetNextRoutingId() {
return ++last_routing_id_;
}
-int32 GpuProcessHost::NewRenderWidgetHostView(gfx::NativeViewId parent) {
+int32 GpuProcessHost::NewRenderWidgetHostView(GpuNativeWindowHandle parent) {
int32 routing_id = GetNextRoutingId();
Send(new GpuMsg_NewRenderWidgetHostView(parent, routing_id));
return routing_id;