| Index: services/ui/ws/gpu_service_proxy.h
|
| diff --git a/services/ui/ws/gpu_service_proxy.h b/services/ui/ws/gpu_service_proxy.h
|
| index f5d8446173665a22047830fe3655377dfcd9b1ce..cfaeaba35ea72d56d5ac2f24691e499540de6ba3 100644
|
| --- a/services/ui/ws/gpu_service_proxy.h
|
| +++ b/services/ui/ws/gpu_service_proxy.h
|
| @@ -30,10 +30,9 @@ namespace ws {
|
| class GpuServiceProxyDelegate;
|
| class MusGpuMemoryBufferManager;
|
|
|
| -// The proxy implementation that relays requests from clients to the real
|
| -// service implementation in the GPU process over mojom.GpuServiceInternal.
|
| -class GpuServiceProxy : public mojom::GpuService,
|
| - public gpu::GpuChannelHostFactory {
|
| +// Sets up connection from clients to the real service implementation in the GPU
|
| +// process.
|
| +class GpuServiceProxy : public gpu::GpuChannelHostFactory {
|
| public:
|
| explicit GpuServiceProxy(GpuServiceProxyDelegate* delegate);
|
| ~GpuServiceProxy() override;
|
| @@ -42,25 +41,9 @@ class GpuServiceProxy : public mojom::GpuService,
|
|
|
| private:
|
| void OnInitialized(const gpu::GPUInfo& gpu_info);
|
| - void OnGpuChannelEstablished(const EstablishGpuChannelCallback& callback,
|
| - int32_t client_id,
|
| - mojo::ScopedMessagePipeHandle channel_handle);
|
| void OnInternalGpuChannelEstablished(
|
| mojo::ScopedMessagePipeHandle channel_handle);
|
|
|
| - // mojom::GpuService overrides:
|
| - void EstablishGpuChannel(
|
| - const EstablishGpuChannelCallback& callback) override;
|
| - void CreateGpuMemoryBuffer(
|
| - gfx::GpuMemoryBufferId id,
|
| - const gfx::Size& size,
|
| - gfx::BufferFormat format,
|
| - gfx::BufferUsage usage,
|
| - const mojom::GpuService::CreateGpuMemoryBufferCallback& callback)
|
| - override;
|
| - void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
|
| - const gpu::SyncToken& sync_token) override;
|
| -
|
| // gpu::GpuChannelHostFactory overrides:
|
| bool IsMainThread() override;
|
| scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
|
| @@ -71,7 +54,6 @@ class GpuServiceProxy : public mojom::GpuService,
|
| int32_t next_client_id_;
|
| scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
|
| mojom::GpuServiceInternalPtr gpu_service_;
|
| - mojo::BindingSet<mojom::GpuService> bindings_;
|
| gpu::GPUInfo gpu_info_;
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
|
| base::WaitableEvent shutdown_event_;
|
|
|