Rename DisplayCompositor to MojoFrameSinkManager.

services/ui/surfaces/mojo_frame_sink_manager.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_
+#ifndef SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_
+#define SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <unordered_map>
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "cc/ipc/display_compositor.mojom.h"
+#include "cc/ipc/frame_sink_manager.mojom.h"
 #include "cc/surfaces/frame_sink_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 "gpu/ipc/common/surface_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace ui {
 
 class DisplayProvider;
 
-// 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
+// MojoFrameSinkManager manages state associated with CompositorFrameSinks. It
+// provides a Mojo interface to create CompositorFrameSinks, manage BeginFrame

[msw, 2017/04/03 20:07:34]

nit: 'manages' here and on the next line?

[kylechar, 2017/04/03 20:32:06]

Done.

+// hierarchy and managed surface lifetime.
+//
+// This is intended to created in the viz or GPU process. For mus+ash this will

[msw, 2017/04/03 20:07:34]

nit: 'be created'? Is 'viz' the appropriate process name?

[kylechar, 2017/04/03 20:32:06]

Changed. Also, yep, basically GPU process => viz process basically.

+// be true after the mus process split. For non-mus Chrome this will be created
+// in the browser process, at least until GPU implementations can be unified.
+class MojoFrameSinkManager
     : public cc::SurfaceObserver,
       public display_compositor::GpuCompositorFrameSinkDelegate,
-      public cc::mojom::DisplayCompositor {
+      public cc::mojom::FrameSinkManager {
  public:
-  DisplayCompositor(DisplayProvider* display_provider,
-                    cc::mojom::DisplayCompositorRequest request,
-                    cc::mojom::DisplayCompositorClientPtr client);
-  ~DisplayCompositor() override;
+  MojoFrameSinkManager(DisplayProvider* display_provider,
+                       cc::mojom::FrameSinkManagerRequest request,
+                       cc::mojom::FrameSinkManagerClientPtr client);
+  ~MojoFrameSinkManager() override;
 
   cc::SurfaceManager* manager() { return &manager_; }
 
-  // cc::mojom::DisplayCompositor implementation:
+  // cc::mojom::MojoFrameSinkManager implementation:
   void CreateRootCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::DisplayPrivateAssociatedRequest display_private_request)
       override;
   void CreateCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
@@ skipping 35 matching lines @@
   // Provides a cc::Display for CreateRootCompositorFrameSink().
   DisplayProvider* const display_provider_;
 
   std::unordered_map<cc::FrameSinkId,
                      std::unique_ptr<cc::mojom::MojoCompositorFrameSink>,
                      cc::FrameSinkIdHash>
       compositor_frame_sinks_;
 
   base::ThreadChecker thread_checker_;
 
-  cc::mojom::DisplayCompositorClientPtr client_;
-  mojo::Binding<cc::mojom::DisplayCompositor> binding_;
+  cc::mojom::FrameSinkManagerClientPtr client_;
+  mojo::Binding<cc::mojom::FrameSinkManager> binding_;
 
-  DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
+  DISALLOW_COPY_AND_ASSIGN(MojoFrameSinkManager);
 };
 
 }  // namespace ui
 
-#endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
+#endif  //  SERVICES_UI_SURFACES_MOJO_FRAME_SINK_MANAGER_H_