Fix gpu acceleration with --in-process-gpu

content/browser/gpu/gpu_process_host.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #pragma once
 
 #include <map>
 #include <queue>
 
 #include "base/callback_old.h"
 #include "base/memory/linked_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/browser/browser_child_process_host.h"
 #include "content/common/gpu/gpu_info.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "ui/gfx/native_widget_types.h"
 
 struct GPUCreateCommandBufferConfig;
 
 namespace IPC {
 class Message;
 }
 
+class GpuThreadWrapper;

[jam, 2011/05/26 01:15:24]

nit: can you call this GpuMainThread for consistency with
BrowserRenderProcessHost's RendererMainThread

+
 class GpuProcessHost : public BrowserChildProcessHost,
                        public base::NonThreadSafe {
  public:
   // Creates a new GpuProcessHost or gets one for a particular
   // renderer process, resulting in the launching of a GPU process if required.
   // Returns null on failure. It is not safe to store the pointer once control
   // has returned to the message loop as it can be destroyed. Instead store the
   // associated GPU host ID. A renderer ID of zero means the browser process.
   // This could return NULL if GPU access is not allowed (blacklisted).
   static GpuProcessHost* GetForRenderer(int renderer_id,
@@ skipping 39 matching lines @@
   // Tells the GPU process to create a new command buffer that draws into the
   // window associated with the given renderer.
   void CreateViewCommandBuffer(
       gfx::PluginWindowHandle compositing_surface,
       int32 render_view_id,
       int32 renderer_id,
       const GPUCreateCommandBufferConfig& init_params,
       CreateCommandBufferCallback* callback);
 
  private:
-  GpuProcessHost(int host_id);
+  GpuProcessHost(int host_id, bool in_process);
   virtual ~GpuProcessHost();
 
   bool Init();
 
   // Post an IPC message to the UI shim's message handler on the UI thread.
   void RouteOnUIThread(const IPC::Message& message);
 
   virtual bool CanShutdown();
   virtual void OnProcessLaunched();
   virtual void OnChildDied();
@@ skipping 48 matching lines @@
   typedef std::multimap<ViewID, linked_ptr<SurfaceRef> > SurfaceRefMap;
   SurfaceRefMap surface_refs_;
 #endif
 
   // Qeueud messages to send when the process launches.
   std::queue<IPC::Message*> queued_messages_;
 
   // The handle for the GPU process or null if it is not known to be launched.
   base::ProcessHandle gpu_process_;
 
+  // Whether we are running a GPU thread inside the browser process instead
+  // of a separate GPU process.
+  bool in_process_;
+
+  scoped_ptr<GpuThreadWrapper> in_process_gpu_thread_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_