WIP: Towards merging OffscreenCanvas and Mus code

content/browser/compositor/gpu_process_transport_factory.h

 // Copyright 2014 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 CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "build/build_config.h"
+#include "cc/ipc/display_compositor.mojom.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "ui/compositor/compositor.h"
 
 namespace cc {
 class SingleThreadTaskGraphRunner;
 class SoftwareOutputDevice;
 class SurfaceManager;
 class VulkanInProcessContextProvider;
 }
 
 namespace ui {
 class ContextProviderCommandBuffer;
 }
 
 namespace content {
 class OutputDeviceBacking;
 
 class GpuProcessTransportFactory : public ui::ContextFactory,
                                    public ui::ContextFactoryPrivate,
-                                   public ImageTransportFactory {
+                                   public ImageTransportFactory,
+                                   public cc::mojom::DisplayCompositorClient {
  public:
   GpuProcessTransportFactory();
 
   ~GpuProcessTransportFactory() override;
 
   // ui::ContextFactory implementation.
   void CreateCompositorFrameSink(
       base::WeakPtr<ui::Compositor> compositor) override;
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   uint32_t GetImageTextureTarget(gfx::BufferFormat format,
@@ skipping 19 matching lines @@
                                      base::TimeDelta interval) override;
   void SetDisplayVSyncParameters(ui::Compositor* compositor,
                                  base::TimeTicks timebase,
                                  base::TimeDelta interval) override;
   void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override;
 
   // ImageTransportFactory implementation.
   ui::ContextFactory* GetContextFactory() override;
   ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
   cc::SurfaceManager* GetSurfaceManager() override;
+  display_compositor::DisplayCompositor* GetDisplayCompositor() override;
   display_compositor::GLHelper* GetGLHelper() override;
   void SetGpuChannelEstablishFactory(
       gpu::GpuChannelEstablishFactory* factory) override;
 #if defined(OS_MACOSX)
   void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
                                         bool suspended) override;
 #endif
 
+  // cc::mojom::DisplayCompositorClient:
+  void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
+
  private:
   struct PerCompositorData;
 
   PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
   std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
       ui::Compositor* compositor);
   void EstablishedGpuChannel(
       base::WeakPtr<ui::Compositor> compositor,
       bool create_gpu_output_surface,
       int num_attempts,
       scoped_refptr<gpu::GpuChannelHost> established_channel_host);
 
   void OnLostMainThreadSharedContextInsideCallback();
   void OnLostMainThreadSharedContext();
 
   scoped_refptr<cc::VulkanInProcessContextProvider>
   SharedVulkanContextProvider();
 
-  std::unique_ptr<cc::SurfaceManager> surface_manager_;
+  mojo::Binding<cc::mojom::DisplayCompositorClient>
+      display_compositor_client_binding_;
+  cc::mojom::DisplayCompositorPtr display_compositor_ptr_;
+
+  std::unique_ptr<display_compositor::DisplayCompositor> display_compositor_;
   uint32_t next_sink_id_ = 1u;
 
 #if defined(OS_WIN)
   // Used by output surface, stored in PerCompositorData.
   std::unique_ptr<OutputDeviceBacking> software_backing_;
 #endif
 
   // Depends on SurfaceManager.
   typedef std::map<ui::Compositor*, std::unique_ptr<PerCompositorData>>
       PerCompositorDataMap;
@@ skipping 13 matching lines @@
   gpu::GpuChannelEstablishFactory* gpu_channel_factory_ = nullptr;
 
   base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_