Fix --single-process mode issues with GpuChannelHostFactory

content/browser/renderer_host/image_transport_factory.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/browser/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/renderer_host/image_transport_client.h"
 #include "content/common/gpu/client/command_buffer_proxy.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/compositor_setup.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
+using content::BrowserGpuChannelHostFactory;
+
 namespace {
 
 ImageTransportFactory* g_factory;
 
 class DefaultTransportFactory
     : public ui::DefaultContextFactory,
       public ImageTransportFactory {
  public:
   DefaultTransportFactory() {
     ui::DefaultContextFactory::Initialize();
@@ skipping 187 matching lines @@
   }
 
   virtual WebKit::WebGraphicsContext3D* CreateContext(
       ui::Compositor* compositor) OVERRIDE {
     PerCompositorData* data = per_compositor_data_[compositor];
     if (!data)
       data = CreatePerCompositorData(compositor);
 
     WebKit::WebGraphicsContext3D::Attributes attrs;
     attrs.shareResources = true;
+    GpuChannelHostFactory* factory = BrowserGpuChannelHostFactory::instance();
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
         new WebGraphicsContext3DCommandBufferImpl(
-            data->surface_id, GURL(), data->swap_client->AsWeakPtr()));
+            data->surface_id, GURL(), factory, data->swap_client->AsWeakPtr()));
     if (!context->Initialize(attrs))
       return NULL;
     return context.release();
   }
 
   virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE {
     PerCompositorDataMap::iterator it = per_compositor_data_.find(compositor);
     if (it == per_compositor_data_.end())
       return;
     PerCompositorData* data = it->second;
@@ skipping 106 matching lines @@
 
     return data;
   }
 
   void CreateSharedContext(ui::Compositor* compositor) {
     PerCompositorData* data = per_compositor_data_[compositor];
     DCHECK(data);
 
     data->swap_client.reset(new CompositorSwapClient(compositor, this));
 
+    GpuChannelHostFactory* factory = BrowserGpuChannelHostFactory::instance();
     WebKit::WebGraphicsContext3D::Attributes attrs;
     attrs.shareResources = true;
     data->shared_context.reset(new WebGraphicsContext3DCommandBufferImpl(
-          data->surface_id, GURL(), data->swap_client->AsWeakPtr()));
+          data->surface_id, GURL(), factory, data->swap_client->AsWeakPtr()));
     if (!data->shared_context->Initialize(attrs)) {
       // If we can't recreate contexts, we won't be able to show the UI. Better
       // crash at this point.
       LOG(FATAL) << "Failed to initialize compositor shared context.";
     }
     if (!data->shared_context->makeContextCurrent()) {
       // If we can't recreate contexts, we won't be able to show the UI. Better
       // crash at this point.
       LOG(FATAL) << "Failed to make compositor shared context current.";
     }
@@ skipping 37 matching lines @@
 void ImageTransportFactory::Terminate() {
   ui::ContextFactory::SetInstance(NULL);
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }