Mus: surfaces::CompositorFrameSink => DisplayCompositorFrameSink

services/ui/surfaces/display_compositor_frame_sink.h

Index: services/ui/surfaces/display_compositor_frame_sink.h
diff --git a/services/ui/surfaces/compositor_frame_sink.h b/services/ui/surfaces/display_compositor_frame_sink.h
similarity index 70%
rename from services/ui/surfaces/compositor_frame_sink.h
rename to services/ui/surfaces/display_compositor_frame_sink.h
index ab5290ddb2c4cb73d5b7271c7ee3ac4b9c3d8ee6..51cd2ffb3df8f6de878bb69277302ed9c53bf58a 100644
--- a/services/ui/surfaces/compositor_frame_sink.h
+++ b/services/ui/surfaces/display_compositor_frame_sink.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_
-#define SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_
+#ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_FRAME_SINK_H_
+#define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_FRAME_SINK_H_
 
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
@@ -22,33 +22,32 @@ class GpuChannelHost;
 }
 
 namespace ui {
-namespace surfaces {
 
 // TODO(fsamuel): This should become a mojo interface for the mus-gpu split.
 // TODO(fsamuel): This should not be a SurfaceFactoryClient.
-// The CompositorFrameSink receives CompositorFrames from all sources,
+// The DisplayCompositorFrameSink receives CompositorFrames from all sources,
 // creates a top-level CompositorFrame once per tick, and generates graphical
 // output.
-class CompositorFrameSink : public cc::SurfaceFactoryClient,
-                            public cc::DisplayClient {
+class DisplayCompositorFrameSink : public cc::SurfaceFactoryClient,
+                                   public cc::DisplayClient {
  public:
-  CompositorFrameSink(
+  DisplayCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       gfx::AcceleratedWidget widget,
       scoped_refptr<gpu::GpuChannelHost> gpu_channel,
       const scoped_refptr<DisplayCompositor>& display_compositor);
-  ~CompositorFrameSink() override;
+  ~DisplayCompositorFrameSink() override;
 
-  // CompositorFrameSink embedders submit a CompositorFrame when content on the
-  // display should be changed. A well-behaving embedder should only submit
-  // a CompositorFrame once per BeginFrame tick. The callback is called the
-  // first time this frame is used to draw, or if the frame is discarded.
+  // DisplayCompositorFrameSink embedders submit a CompositorFrame when content
+  // on the display should be changed. A well-behaving embedder should only
+  // submit a CompositorFrame once per BeginFrame tick. The callback is called
+  // the first time this frame is used to draw, or if the frame is discarded.
   void SubmitCompositorFrame(cc::CompositorFrame frame,
                              const base::Callback<void()>& callback);
 
   // TODO(fsamuel): This is used for surface hittesting and should not be
-  // exposed outside of CompositorFrameSink.
+  // exposed outside of DisplayCompositorFrameSink.
   const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
 
  private:
@@ -71,10 +70,9 @@ class CompositorFrameSink : public cc::SurfaceFactoryClient,
 
   gfx::Size display_size_;
   std::unique_ptr<cc::Display> display_;
-  DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
+  DISALLOW_COPY_AND_ASSIGN(DisplayCompositorFrameSink);
 };
 
-}  // nanmespace surfaces
 }  // namespace ui
 
-#endif  // SERVICES_UI_SURFACES_COMPOSITOR_FRAME_SINK_H_
+#endif  // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_FRAME_SINK_H_