Move DisplayCompositor code to new component.

components/frame_sinks/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>
+#ifndef COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_
+#define COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_
 
 #include <memory>
 #include <unordered_map>
-#include <vector>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/ipc/display_compositor.mojom.h"
 #include "cc/surfaces/frame_sink_id.h"
-#include "cc/surfaces/local_surface_id.h"
-#include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_observer.h"
-#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
+#include "components/frame_sinks/frame_sinks_export.h"
+#include "components/frame_sinks/gpu_compositor_frame_sink_delegate.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/ipc/common/surface_handle.h"
 #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 Display;
 class SyntheticBeginFrameSource;
 }
 
-namespace display_compositor {
-class GpuCompositorFrameSink;
-}
-
-namespace ui {
+namespace frame_sinks {
 
 // The DisplayCompositor object is an object global to the Window Server app
 // that holds the SurfaceServer and allocates new Surfaces namespaces.
 // This object lives on the main thread of the Window Server.
-// TODO(rjkroege, fsamuel): This object will need to change to support multiple
-// displays.
-class DisplayCompositor
+class FRAME_SINKS_EXPORT DisplayCompositor
     : public cc::SurfaceObserver,
-      public display_compositor::GpuCompositorFrameSinkDelegate,
+      public GpuCompositorFrameSinkDelegate,
       public cc::mojom::DisplayCompositor {
  public:
   DisplayCompositor(
       scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service,
       std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager,
       gpu::ImageFactory* image_factory,
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtr client);
   ~DisplayCompositor() override;
 
@@ skipping 32 matching lines @@
   // removed from the map, |frame_sink_id| would also be destroyed if it were a
   // reference. But the map can continue to iterate and try to use it. Passing
   // by value avoids this.
   void DestroyCompositorFrameSink(cc::FrameSinkId frame_sink_id);
 
   // cc::SurfaceObserver implementation.
   void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
   void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                         bool* changed) override;
 
-  // display_compositor::GpuCompositorFrameSinkDelegate implementation.
+  // GpuCompositorFrameSinkDelegate implementation.
   void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
                               bool destroy_compositor_frame_sink) override;
   void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
                                bool destroy_compositor_frame_sink) 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::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
   gpu::ImageFactory* image_factory_;
 
   std::unordered_map<cc::FrameSinkId,
                      std::unique_ptr<cc::mojom::MojoCompositorFrameSink>,
                      cc::FrameSinkIdHash>
       compositor_frame_sinks_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   cc::mojom::DisplayCompositorClientPtr client_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
-}  // namespace ui
+}  // namespace frame_sinks
 
-#endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
+#endif  //  COMPONENTS_FRAME_SINKS_DISPLAY_COMPOSITOR_H_