Remove renderer dependencies from the GPU client classes.

content/renderer/render_thread_impl.h

 // Copyright (c) 2012 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_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "build/build_config.h"
+#include "content/common/child_process.h"
 #include "content/common/child_thread.h"
 #include "content/common/content_export.h"
 #include "content/common/css_colors.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/renderer/render_thread.h"
+#include "content/renderer/gpu/gpu_channel_host.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ui/gfx/native_widget_types.h"
 
 class AppCacheDispatcher;
 class AudioInputMessageFilter;
 class AudioMessageFilter;
 class CompositorThread;
 class DBMessageFilter;
 class DevToolsAgentFilter;
 struct DOMStorageMsg_Event_Params;
@@ skipping 28 matching lines @@
 // The RenderThreadImpl class represents a background thread where RenderView
 // instances live.  The RenderThread supports an API that is used by its
 // consumer to talk indirectly to the RenderViews and supporting objects.
 // Likewise, it provides an API for the RenderViews to talk back to the main
 // process (i.e., their corresponding TabContents).
 //
 // Most of the communication occurs in the form of IPC messages.  They are
 // routed to the RenderThread according to the routing IDs of the messages.
 // The routing IDs correspond to RenderView instances.
 class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
-                                        public ChildThread {
+                                        public ChildThread,
+                                        public GpuChannelHostFactory {
  public:
   static RenderThreadImpl* current();
 
   RenderThreadImpl();
   // Constructor that's used when running in single process mode.
   explicit RenderThreadImpl(const std::string& channel_name);
   virtual ~RenderThreadImpl();
 
   // Returns the routing ID of the RenderWidget containing the current script
   // execution context (corresponding to WebFrame::frameForCurrentContext).
@@ skipping 30 matching lines @@
   virtual void ScheduleIdleHandler(int64 initial_delay_ms) OVERRIDE;
   virtual void IdleHandler() OVERRIDE;
   virtual int64 GetIdleNotificationDelayInMs() const OVERRIDE;
   virtual void SetIdleNotificationDelayInMs(
       int64 idle_notification_delay_in_ms) OVERRIDE;
 #if defined(OS_WIN)
   virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE;
   virtual void ReleaseCachedFonts() OVERRIDE;
 #endif
 
+  // GpuChannelHostFactory implementation:
+  virtual bool IsMainThread() OVERRIDE;
+  virtual bool IsIOThread() OVERRIDE;
+  virtual MessageLoop* GetMainLoop() OVERRIDE;
+  virtual base::MessageLoopProxy* GetIOLoopProxy() OVERRIDE;
+  virtual base::WaitableEvent* GetShutDownEvent() OVERRIDE;
+  virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(
+      uint32 size) OVERRIDE;
+  virtual int32 CreateViewCommandBuffer(
+      int32 surface_id,
+      const GPUCreateCommandBufferConfig& init_params) OVERRIDE;
+
+  // Synchronously establish a channel to the GPU plugin if not previously
+  // established or if it has been lost (for example if the GPU plugin crashed).
+  // If there is a pending asynchronous request, it will be completed by the
+  // time this routine returns.
+  virtual GpuChannelHost* EstablishGpuChannelSync(
+      content::CauseForGpuLaunch) OVERRIDE;
+
+
   // These methods modify how the next message is sent.  Normally, when sending
   // a synchronous message that runs a nested message loop, we need to suspend
   // callbacks into WebKit.  This involves disabling timers and deferring
   // resource loads.  However, there are exceptions when we need to customize
   // the behavior.
   void DoNotSuspendWebKitSharedTimer();
   void DoNotNotifyWebKitOfModalLoop();
 
   // Will be NULL if threaded compositing has not been enabled.
   CompositorThread* compositor_thread() const {
@@ skipping 11 matching lines @@
   AudioMessageFilter* audio_message_filter() {
     return audio_message_filter_.get();
   }
 
   VideoCaptureImplManager* video_capture_impl_manager() const {
     return vc_manager_.get();
   }
 
   bool plugin_refresh_allowed() const { return plugin_refresh_allowed_; }
 
-  // Synchronously establish a channel to the GPU plugin if not previously
-  // established or if it has been lost (for example if the GPU plugin crashed).
-  // If there is a pending asynchronous request, it will be completed by the
-  // time this routine returns.
-  GpuChannelHost* EstablishGpuChannelSync(content::CauseForGpuLaunch);
-
   // Get the GPU channel. Returns NULL if the channel is not established or
   // has been lost.
   GpuChannelHost* GetGpuChannel();
 
   // Returns a MessageLoopProxy instance corresponding to the message loop
   // of the thread on which file operations should be run. Must be called
   // on the renderer's main thread.
   scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy();
 
   // Causes the idle handler to skip sending idle notifications
@@ skipping 71 matching lines @@
 
   bool compositor_initialized_;
   scoped_ptr<CompositorThread> compositor_thread_;
 
   ObserverList<content::RenderProcessObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_