Mus: Avoid deadlock during teardown

services/ui/gpu/gpu_service_internal.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_
 #define SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_
 
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 32 matching lines @@
 // the window server) over the mojom APIs. This is responsible for setting up
 // the connection to clients, allocating/free'ing gpu memory etc.
 class GpuServiceInternal : public gpu::GpuChannelManagerDelegate,
                            public mojom::GpuServiceInternal,
                            public base::NonThreadSafe {
  public:
   ~GpuServiceInternal() override;
 
   void Add(mojom::GpuServiceInternalRequest request);
 
+  void DestroyDisplayCompositor();
+
  private:
   friend class GpuMain;
 
-  GpuServiceInternal(const gpu::GPUInfo& gpu_info,
-                     std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
-                     gpu::GpuMemoryBufferFactory* memory_buffer_factory,
-                     scoped_refptr<base::SingleThreadTaskRunner> io_runner);
+  GpuServiceInternal(
+      const gpu::GPUInfo& gpu_info,
+      std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
+      gpu::GpuMemoryBufferFactory* memory_buffer_factory,
+      scoped_refptr<base::SingleThreadTaskRunner> io_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner);
 
   gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
       gfx::GpuMemoryBufferHandle buffer_handle,
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       int client_id);
 
   // gpu::GpuChannelManagerDelegate:
   void DidCreateOffscreenContext(const GURL& active_url) override;
@@ skipping 32 matching lines @@
                               const gpu::SyncToken& sync_token) override;
   void CreateDisplayCompositor(
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtr client) override;
 
   void CreateDisplayCompositorOnCompositorThread(
       mojom::GpuServiceInternalPtrInfo gpu_service_info,
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtrInfo client_info);
 
+  void DestroyDisplayCompositorOnCompositorThread();
+
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> compositor_runner_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
   std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread_;
 
   gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory_;
 
   gpu::GpuPreferences gpu_preferences_;
 
   // Information about the GPU, such as device and vendor ID.
   gpu::GPUInfo gpu_info_;
 
-  base::Thread compositor_thread_;
+  std::unique_ptr<ui::DisplayCompositor> display_compositor_;
 
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_command_service_;
   std::unique_ptr<gpu::SyncPointManager> owned_sync_point_manager_;
   std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
   std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_;
   mojo::BindingSet<mojom::GpuServiceInternal> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuServiceInternal);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_GPU_GPU_SERVICE_INTERNAL_H_