| Index: services/ui/gpu/gpu_service.h
|
| diff --git a/services/ui/gpu/gpu_service.h b/services/ui/gpu/gpu_service.h
|
| index 70edb38ecbf17e0046b063455d57ee614f10aa5b..bafa269eb2cab030511984ace0540bf327bbda25 100644
|
| --- a/services/ui/gpu/gpu_service.h
|
| +++ b/services/ui/gpu/gpu_service.h
|
| @@ -43,8 +43,7 @@ class GpuMain;
|
| // the window server) over the mojom APIs. This is responsible for setting up
|
| // the connection to clients, allocating/free'ing gpu memory etc.
|
| class GpuService : public gpu::GpuChannelManagerDelegate,
|
| - public mojom::GpuService,
|
| - public base::NonThreadSafe {
|
| + public mojom::GpuService {
|
| public:
|
| GpuService(const gpu::GPUInfo& gpu_info,
|
| std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
|
| @@ -153,6 +152,7 @@ class GpuService : public gpu::GpuChannelManagerDelegate,
|
| void ThrowJavaException() override;
|
| void Stop(const StopCallback& callback) override;
|
|
|
| + scoped_refptr<base::SingleThreadTaskRunner> main_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
|
|
|
| // An event that will be signalled when we shutdown.
|
| @@ -185,6 +185,9 @@ class GpuService : public gpu::GpuChannelManagerDelegate,
|
|
|
| mojo::BindingSet<mojom::GpuService> bindings_;
|
|
|
| + base::WeakPtr<GpuService> weak_ptr_;
|
| + base::WeakPtrFactory<GpuService> weak_ptr_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(GpuService);
|
| };
|
|
|
|
|