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..cac4618dbc1cca8d40cdd1eeb3eb8d883775369a 100644 |
--- a/services/ui/ws/gpu_service_proxy.h |
+++ b/services/ui/ws/gpu_service_proxy.h |
@@ -17,36 +17,32 @@ |
#include "services/ui/public/interfaces/gpu_memory_buffer.mojom.h" |
#include "services/ui/public/interfaces/gpu_service.mojom.h" |
-namespace gpu { |
-class GpuChannelHost; |
-} |
- |
namespace ui { |
class GpuServiceInternal; |
+class MusGpuMemoryBufferManager; |
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 { |
+class GpuServiceProxy : public mojom::GpuService { |
public: |
explicit GpuServiceProxy(GpuServiceProxyDelegate* delegate); |
~GpuServiceProxy() override; |
void Add(mojom::GpuServiceRequest request); |
+ void CreateDisplayCompositor(cc::mojom::DisplayCompositorRequest request, |
rjkroege
2016/11/21 23:05:36
method docs?
Fady Samuel
2016/11/22 01:02:23
Done.
|
+ cc::mojom::DisplayCompositorClientPtr client); |
+ |
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( |
@@ -61,22 +57,12 @@ class GpuServiceProxy : public mojom::GpuService, |
void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
const gpu::SyncToken& sync_token) override; |
- // gpu::GpuChannelHostFactory overrides: |
- bool IsMainThread() override; |
- scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override; |
- std::unique_ptr<base::SharedMemory> AllocateSharedMemory( |
- size_t size) override; |
- |
- GpuServiceProxyDelegate* delegate_; |
+ GpuServiceProxyDelegate* const delegate_; |
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_; |
- std::unique_ptr<base::Thread> io_thread_; |
- std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_; |
GpuMain gpu_main_; |
DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy); |