Mus: Implement GpuMain mojo interface

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"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
 #include "gpu/ipc/service/gpu_config.h"
 #include "gpu/ipc/service/x_util.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
-#include "services/ui/surfaces/display_compositor.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gpu {
 class GpuChannelHost;
 class GpuMemoryBufferFactory;
 class GpuWatchdogThread;
 class SyncPointManager;
 }
 
 namespace media {
 class MediaGpuChannelManager;
 }
 
 namespace ui {
 
 class GpuMain;
 
 // This runs in the GPU process, and communicates with the gpu host (which is
 // 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(const gpu::GPUInfo& gpu_info,
+                     std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
+                     gpu::GpuMemoryBufferFactory* memory_buffer_factory,
+                     scoped_refptr<base::SingleThreadTaskRunner> io_runner);
+
   ~GpuServiceInternal() override;
 
-  void Add(mojom::GpuServiceInternalRequest request);
-
-  void DestroyDisplayCompositor();
+  void Bind(mojom::GpuServiceInternalRequest request);
 
  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,
-      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::SyncPointManager* sync_point_manager() {
+    return owned_sync_point_manager_.get();
+  }
+
+  gpu::gles2::MailboxManager* mailbox_manager() {
+    return gpu_channel_manager_->mailbox_manager();
+  }
+
+  gl::GLShareGroup* share_group() {
+    return gpu_channel_manager_->share_group();
+  }
+
   // gpu::GpuChannelManagerDelegate:
   void DidCreateOffscreenContext(const GURL& active_url) override;
   void DidDestroyChannel(int client_id) override;
   void DidDestroyOffscreenContext(const GURL& active_url) override;
   void DidLoseContext(bool offscreen,
                       gpu::error::ContextLostReason reason,
                       const GURL& active_url) override;
   void StoreShaderToDisk(int client_id,
                          const std::string& key,
                          const std::string& shader) override;
@@ skipping 15 matching lines @@
       gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int client_id,
       gpu::SurfaceHandle surface_handle,
       const CreateGpuMemoryBufferCallback& callback) override;
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id,
                               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> gpu_runner_;
   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_;
 
-  std::unique_ptr<ui::DisplayCompositor> display_compositor_;
-
-  // The message-pipe used by the DisplayCompositor to request gpu memory
-  // buffers.
-  mojom::GpuServiceInternalPtr gpu_internal_;
-
-  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_