| Index: content/browser/gpu/browser_gpu_channel_host_factory.h
|
| diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| index 530768c44b448b00470b8506e2aaea4a92b05689..0789683b09367610920b052bcf7d5d1b5a93619a 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| @@ -16,10 +16,14 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "content/common/gpu/client/gpu_channel_host.h"
|
| +#include "content/common/gpu/client/gpu_channel_host_factory.h"
|
| +#include "content/common/gpu/client/ipc/gpu_host_ipc_transport_factory_impl.h"
|
| #include "ipc/message_filter.h"
|
|
|
| namespace content {
|
| +
|
| class BrowserGpuMemoryBufferManager;
|
| +struct GpuCreateCommandBufferConfig;
|
|
|
| class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| : public GpuChannelHostFactory {
|
| @@ -34,7 +38,7 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override;
|
| CreateCommandBufferResult CreateViewCommandBuffer(
|
| int32_t surface_id,
|
| - const GPUCreateCommandBufferConfig& init_params,
|
| + const GpuCreateCommandBufferConfig& init_params,
|
| int32_t route_id) override;
|
|
|
| int GpuProcessHostId() { return gpu_host_id_; }
|
| @@ -61,7 +65,7 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| void CreateViewCommandBufferOnIO(
|
| CreateRequest* request,
|
| int32_t surface_id,
|
| - const GPUCreateCommandBufferConfig& init_params);
|
| + const GpuCreateCommandBufferConfig& init_params);
|
| static void CommandBufferCreatedOnIO(CreateRequest* request,
|
| CreateCommandBufferResult result);
|
| static void AddFilterOnIO(int gpu_host_id,
|
| @@ -78,6 +82,8 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| scoped_refptr<EstablishRequest> pending_request_;
|
| std::vector<base::Closure> established_callbacks_;
|
|
|
| + GpuHostIPCTransportFactoryImpl transport_factory_;
|
| +
|
| static BrowserGpuChannelHostFactory* instance_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
|
|
|