Mus: Move creation of cc::Display to DisplayCompositor

services/ui/surfaces/display_compositor.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_DISPLAY_COMPOSITOR_H_
 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
 #include "gpu/ipc/in_process_command_buffer.h"
 #include "ipc/ipc_channel_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace gpu {
 class GpuMemoryBufferManager;
 class ImageFactory;
 }
 
 namespace cc {
-class SurfaceHittest;
+class Display;
 class SurfaceManager;
-}  // namespace cc
+}
 
 namespace ui {
 
 namespace test {
 class DisplayCompositorTest;
 }
 
 class DisplayCompositorClient;
 class GpuCompositorFrameSink;
 
@@ skipping 35 matching lines @@
   void OnCompositorFrameSinkClientConnectionLost(
       const cc::FrameSinkId& frame_sink_id,
       bool destroy_compositor_frame_sink);
   void OnCompositorFrameSinkPrivateConnectionLost(
       const cc::FrameSinkId& frame_sink_id,
       bool destroy_compositor_frame_sink);
 
  private:
   friend class test::DisplayCompositorTest;
 
+  std::unique_ptr<cc::Display> CreateDisplay(
+      const cc::FrameSinkId& frame_sink_id,
+      gpu::SurfaceHandle surface_handle);
+
   const cc::SurfaceId& GetRootSurfaceId() const;
 
   // cc::SurfaceObserver implementation.
   void OnSurfaceCreated(const cc::SurfaceId& surface_id,
                         const gfx::Size& frame_size,
                         float device_scale_factor) override;
   void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                         bool* changed) override;
 
   // SurfaceManager should be the first object constructed and the last object
   // destroyed in order to ensure that all other objects that depend on it have
   // access to a valid pointer for the entirety of their liftimes.
   cc::SurfaceManager manager_;
-  scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service_;
-  std::unordered_map<cc::FrameSinkId,
-                     std::unique_ptr<GpuCompositorFrameSink>,
-                     cc::FrameSinkIdHash>
-      compositor_frame_sinks_;
-  std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
-  gpu::ImageFactory* image_factory_;
-  cc::mojom::DisplayCompositorClientPtr client_;
 
   // Will normally point to |manager_| as it provides the interface. For tests
   // it will be swapped out with a mock implementation.
   cc::SurfaceReferenceManager* reference_manager_;
 
+  scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service_;
+  std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
+  gpu::ImageFactory* image_factory_;
+
+  std::unordered_map<cc::FrameSinkId,
+                     std::unique_ptr<GpuCompositorFrameSink>,
+                     cc::FrameSinkIdHash>
+      compositor_frame_sinks_;
+
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+
   // SurfaceIds that have temporary references from top level root so they
   // aren't GC'd before DisplayCompositorClient can add a real reference. This
   // is basically a collection of surface ids, for example:
   //   cc::SurfaceId surface_id(key, value[index]);
   // The LocalFrameIds are stored in the order the surfaces are created in.
   std::unordered_map<cc::FrameSinkId,
                      std::vector<cc::LocalFrameId>,
                      cc::FrameSinkIdHash>
       temp_references_;
 
   base::ThreadChecker thread_checker_;
 
+  cc::mojom::DisplayCompositorClientPtr client_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_