Fix --single-process mode issues with GpuChannelHostFactory

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

 // 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.
 
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 30 matching lines @@
   base::AutoLock lock(g_all_shared_contexts_lock.Get());
   g_all_shared_contexts.Pointer()->clear();
 }
 
 } // namespace anonymous
 
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl(
     int surface_id,
     const GURL& active_url,
+    GpuChannelHostFactory* factory,
     const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client)
     : initialize_failed_(false),
+      factory_(factory),
       context_(NULL),
       gl_(NULL),
       host_(NULL),
       surface_id_(surface_id),
       active_url_(active_url),
       swap_client_(swap_client),
       memory_allocation_changed_callback_(0),
       context_lost_callback_(0),
       context_lost_reason_(GL_NO_ERROR),
       error_message_callback_(0),
@@ skipping 18 matching lines @@
     base::AutoLock lock(g_all_shared_contexts_lock.Get());
     g_all_shared_contexts.Pointer()->erase(this);
   }
   delete context_;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::Initialize(
     const WebGraphicsContext3D::Attributes& attributes) {
   DCHECK(!context_);
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::initialize");
-  GpuChannelHostFactory* factory = GpuChannelHostFactory::instance();
-  if (!factory)
+  if (!factory_)
     return false;
 
   // The noExtensions and canRecoverFromContextLoss flags are
   // currently used as hints that we are creating a context on
   // behalf of WebGL or accelerated 2D canvas, respectively.
   if (attributes.noExtensions || !attributes.canRecoverFromContextLoss)
     gpu_preference_ = gfx::PreferDiscreteGpu;
 
   bool retry = false;
 
   // Note similar code in Pepper PlatformContext3DImpl::Init.
   do {
-    host_ = factory->EstablishGpuChannelSync(
+    host_ = factory_->EstablishGpuChannelSync(
         content::
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE);
     if (!host_)
       return false;
     DCHECK(host_->state() == GpuChannelHost::kConnected);
 
     if (!retry) {
       // If the creation of this context requires all contexts for this
       // client to be destroyed on the GPU process side, then drop the
       // channel and recreate it.
@@ skipping 993 matching lines @@
 
 void WebGraphicsContext3DCommandBufferImpl::deleteShader(WebGLId shader) {
   gl_->DeleteShader(shader);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::deleteTexture(WebGLId texture) {
   gl_->DeleteTextures(1, &texture);
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::ShouldUseSwapClient() {
-  GpuChannelHostFactory* factory = GpuChannelHostFactory::instance();
-  return factory && factory->IsMainThread() && swap_client_.get();
+  return factory_ && factory_->IsMainThread() && swap_client_.get();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete() {
   typedef WebGraphicsContext3DSwapBuffersClient WGC3DSwapClient;
   // This may be called after tear-down of the RenderView.
   if (ShouldUseSwapClient()) {
     MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
         &WGC3DSwapClient::OnViewContextSwapBuffersComplete, swap_client_));
   }
 
@@ skipping 76 matching lines @@
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
     const std::string& message, int id) {
   if (error_message_callback_) {
     WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
     error_message_callback_->onErrorMessage(str, id);
   }
 }