Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.

content/common/gpu/gpu_channel.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_GPU_GPU_CHANNEL_H_
-#define CONTENT_GPU_GPU_CHANNEL_H_
+#ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_
+#define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
+#include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/message_router.h"
-#include "content/gpu/gpu_command_buffer_stub.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
-class GpuRenderThread;
+class GpuChannelManager;
 class GpuWatchdogThread;
 struct GPUCreateCommandBufferConfig;
 class MessageLoop;
 
 namespace base {
 class WaitableEvent;
 }
 
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class GpuChannel : public IPC::Channel::Listener,
                    public IPC::Message::Sender,
                    public base::RefCountedThreadSafe<GpuChannel> {
  public:
   // Takes ownership of the renderer process handle.
-  GpuChannel(GpuRenderThread* gpu_render_thread,
+  GpuChannel(GpuChannelManager* gpu_channel_manager,
              GpuWatchdogThread* gpu_watchdog_thread,
              int renderer_id);
   virtual ~GpuChannel();
 
   bool Init(MessageLoop* io_message_loop, base::WaitableEvent* shutdown_event);
 
-  // Get the GpuThread that owns this channel.
-  GpuRenderThread* gpu_render_thread() const { return gpu_render_thread_; }
+  // Get the GpuChannelManager that owns this channel.
+  GpuChannelManager* gpu_channel_manager() const {
+    return gpu_channel_manager_;
+  }
 
   // Returns the name of the associated IPC channel.
   std::string GetChannelName();
 
 #if defined(OS_POSIX)
   int GetRendererFileDescriptor();
 #endif  // defined(OS_POSIX)
 
   base::ProcessHandle renderer_process() const {
     return renderer_process_;
@@ skipping 31 matching lines @@
       const gfx::Size& size,
       const GPUCreateCommandBufferConfig& init_params,
       uint32 parent_texture_id,
       int32* route_id);
   void OnDestroyCommandBuffer(int32 route_id);
 
   void OnCreateVideoDecoder(int32 context_route_id,
                             int32 decoder_host_id);
   void OnDestroyVideoDecoder(int32 decoder_id);
 
-  // The lifetime of objects of this class is managed by a GpuRenderThread. The
-  // GpuRenderThreads destroy all the GpuChannels that they own when they
+  // The lifetime of objects of this class is managed by a GpuChannelManager.
+  // The GpuChannelManager destroy all the GpuChannels that they own when they
   // are destroyed. So a raw pointer is safe.
-  GpuRenderThread* gpu_render_thread_;
+  GpuChannelManager* gpu_channel_manager_;
 
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // The id of the renderer who is on the other side of the channel.
   int renderer_id_;
 
   // Handle to the renderer process that is on the other side of the channel.
   base::ProcessHandle renderer_process_;
 
   // The process id of the renderer process.
   base::ProcessId renderer_pid_;
 
   // Used to implement message routing functionality to CommandBuffer objects
   MessageRouter router_;
 
 #if defined(ENABLE_GPU)
   typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
   StubMap stubs_;
 #endif  // defined (ENABLE_GPU)
 
   bool log_messages_;  // True if we should log sent and received messages.
   gpu::gles2::DisallowedExtensions disallowed_extensions_;
   GpuWatchdogThread* watchdog_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
-#endif  // CONTENT_GPU_GPU_CHANNEL_H_
+#endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_