Mus: Move creation of cc::Display to DisplayCompositor

services/ui/surfaces/gpu_compositor_frame_sink.h

 // Copyright 2015 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_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
 #define SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
-#include "cc/output/context_provider.h"
-#include "cc/output/in_process_context_provider.h"
 #include "cc/scheduler/begin_frame_source.h"
-#include "cc/surfaces/display.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}
-
-namespace gpu {
-class GpuMemoryBufferManager;
+namespace cc {
+class Display;
 }
 
 namespace ui {
 
 class DisplayCompositor;
 
 // Server side representation of a WindowSurface.
 class GpuCompositorFrameSink : public cc::mojom::MojoCompositorFrameSink,
                                public cc::DisplayClient,
                                public cc::mojom::MojoCompositorFrameSinkPrivate,
                                public cc::SurfaceFactoryClient,
                                public cc::BeginFrameObserver {
  public:
   GpuCompositorFrameSink(
       DisplayCompositor* display_compositor,
       const cc::FrameSinkId& frame_sink_id,
-      gpu::SurfaceHandle widget,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      scoped_refptr<cc::InProcessContextProvider> context_provider,
+      std::unique_ptr<cc::Display> display,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   ~GpuCompositorFrameSink() override;
 
   // cc::mojom::MojoCompositorFrameSink:
   void SetNeedsBeginFrame(bool needs_begin_frame) override;
   void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
                              cc::CompositorFrame frame) override;
 
   // cc::mojom::MojoCompositorFrameSinkPrivate:
   void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
   void RemoveChildFrameSink(
       const cc::FrameSinkId& child_frame_sink_id) override;
 
  private:
-  void InitDisplay(
-      gpu::SurfaceHandle widget,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      scoped_refptr<cc::InProcessContextProvider> context_provider);
-
   void DidReceiveCompositorFrameAck();
 
   // cc::DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const cc::RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   // cc::BeginFrameObserver implementation.
   void OnBeginFrame(const cc::BeginFrameArgs& args) override;
   const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
   void OnBeginFrameSourcePausedChanged(bool paused) override;
 
   void UpdateNeedsBeginFramesInternal();
 
   void OnClientConnectionLost();
   void OnPrivateConnectionLost();
 
   const cc::FrameSinkId frame_sink_id_;
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  DisplayCompositor* display_compositor_;  // owns this.
+  DisplayCompositor* const display_compositor_;  // owns this.
 
   // GpuCompositorFrameSink holds a cc::Display if it created with
   // non-null gpu::SurfaceHandle. In the window server, the display root
   // window's CompositorFrameSink will have a valid gpu::SurfaceHandle.
   std::unique_ptr<cc::Display> display_;
 
   cc::LocalFrameId local_frame_id_;
   cc::SurfaceFactory surface_factory_;
   // Counts the number of CompositorFrames that have been submitted and have not
   // yet received an ACK.
@@ skipping 20 matching lines @@
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate> private_binding_;
 
   base::WeakPtrFactory<GpuCompositorFrameSink> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_