| Index: components/mus/gpu/gpu_service_mus.h
|
| diff --git a/components/mus/gpu/gpu_service_mus.h b/components/mus/gpu/gpu_service_mus.h
|
| index 48eab8c2536d88da0e12ca3016a3eb9345bb9102..a371bdf4da50fa9f8236cb8e4202f290529a9275 100644
|
| --- a/components/mus/gpu/gpu_service_mus.h
|
| +++ b/components/mus/gpu/gpu_service_mus.h
|
| @@ -42,7 +42,7 @@ class MediaService;
|
|
|
| namespace mus {
|
|
|
| -class MojoGpuMemoryBufferManager;
|
| +class MusGpuMemoryBufferManager;
|
|
|
| // TODO(fsamuel): GpuServiceMus is intended to be the Gpu thread within Mus.
|
| // Similar to GpuChildThread, it is a GpuChannelManagerDelegate and will have a
|
| @@ -75,6 +75,14 @@ class GpuServiceMus : public gpu::GpuChannelManagerDelegate,
|
| int client_id,
|
| const gpu::SyncToken& sync_token);
|
|
|
| + gpu::GpuChannelManager* gpu_channel_manager() const {
|
| + return gpu_channel_manager_.get();
|
| + }
|
| +
|
| + gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory() const {
|
| + return gpu_memory_buffer_factory_.get();
|
| + }
|
| +
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_local() const {
|
| return gpu_channel_local_;
|
| }
|
| @@ -147,7 +155,7 @@ class GpuServiceMus : public gpu::GpuChannelManagerDelegate,
|
| std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
|
|
|
| // A GPU memory buffer manager used locally.
|
| - std::unique_ptr<MojoGpuMemoryBufferManager> gpu_memory_buffer_manager_local_;
|
| + std::unique_ptr<MusGpuMemoryBufferManager> gpu_memory_buffer_manager_local_;
|
|
|
| // A GPU channel used locally.
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_local_;
|
|
|