Fix --single-process mode issues with GpuChannelHostFactory

content/common/gpu/client/webgraphicscontext3d_command_buffer_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_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/gpu/client/content_gl_context.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_SKIA)
 #define FLIP_FRAMEBUFFER_VERTICALLY
 #endif
 
 class GpuChannelHost;
+class GpuChannelHostFactory;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Implementation;
 }
 }
 
 using WebKit::WebGLId;
 
 using WebKit::WGC3Dchar;
@@ skipping 17 matching lines @@
   virtual void OnViewContextSwapBuffersComplete() = 0;
   virtual void OnViewContextSwapBuffersAborted() = 0;
 };
 
 class WebGraphicsContext3DCommandBufferImpl
     : public WebKit::WebGraphicsContext3D {
  public:
   WebGraphicsContext3DCommandBufferImpl(
       int surface_id,
       const GURL& active_url,
+      GpuChannelHostFactory* factory,
       const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client);
   virtual ~WebGraphicsContext3DCommandBufferImpl();
 
   bool Initialize(const Attributes& attributes);
 
   //----------------------------------------------------------------------
   // WebGraphicsContext3D methods
 
   // Must be called after initialize() and before any of the following methods.
   // Permanently binds to the first calling thread. Returns false if the
@@ skipping 428 matching lines @@
 
   // Check if we should call into the swap client. We can only do that on the
   // main thread.
   bool ShouldUseSwapClient();
 
   // MemoryAllocationChanged callback.
   void OnMemoryAllocationChanged(const GpuMemoryAllocation& allocation);
 
   bool initialize_failed_;
 
+  // The channel factory to talk to the GPU process
+  GpuChannelHostFactory* factory_;
+
   // The context we use for OpenGL rendering.
   ContentGLContext* context_;
   // The GLES2Implementation we use for OpenGL rendering.
   gpu::gles2::GLES2Implementation* gl_;
 
   // State needed by MaybeInitializeGL.
   GpuChannelHost* host_;
   int32 surface_id_;
   GURL active_url_;
   base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client_;
@@ skipping 24 matching lines @@
 
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   std::vector<uint8> scanline_;
   void FlipVertically(uint8* framebuffer,
                       unsigned int width,
                       unsigned int height);
 #endif
 };
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_