OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ | 5 #ifndef SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ |
6 #define SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ | 6 #define SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ |
7 | 7 |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 gfx::BufferUsage usage, | 54 gfx::BufferUsage usage, |
55 const mojom::GpuService::CreateGpuMemoryBufferCallback& callback) | 55 const mojom::GpuService::CreateGpuMemoryBufferCallback& callback) |
56 override; | 56 override; |
57 void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, | 57 void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
58 const gpu::SyncToken& sync_token) override; | 58 const gpu::SyncToken& sync_token) override; |
59 | 59 |
60 GpuServiceProxyDelegate* const delegate_; | 60 GpuServiceProxyDelegate* const delegate_; |
61 int32_t next_client_id_; | 61 int32_t next_client_id_; |
62 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; | 62 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; |
63 mojom::GpuServiceInternalPtr gpu_service_; | 63 mojom::GpuServiceInternalPtr gpu_service_; |
| 64 cc::mojom::DisplayCompositorFactoryRequest |
| 65 pending_display_compositor_factory_request_; |
| 66 cc::mojom::DisplayCompositorFactoryPtr display_compositor_factory_; |
64 mojo::BindingSet<mojom::GpuService> bindings_; | 67 mojo::BindingSet<mojom::GpuService> bindings_; |
65 gpu::GPUInfo gpu_info_; | 68 gpu::GPUInfo gpu_info_; |
66 std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_; | 69 std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_; |
67 GpuMain gpu_main_; | 70 GpuMain gpu_main_; |
68 | 71 |
69 DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy); | 72 DISALLOW_COPY_AND_ASSIGN(GpuServiceProxy); |
70 }; | 73 }; |
71 | 74 |
72 } // namespace ws | 75 } // namespace ws |
73 } // namespace ui | 76 } // namespace ui |
74 | 77 |
75 #endif // SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ | 78 #endif // SERVICES_UI_WS_GPU_SERVICE_PROXY_H_ |
OLD | NEW |