Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window.h

Index: services/ui/ws/server_window.h
diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index 54ff9202671b9c71a2a0844a240ef1b7d1f72f98..7630a71aaf4dde71d3aee9c9dbccb180efd49de6 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h
@@ -57,9 +57,17 @@ class ServerWindow {
   void RemoveObserver(ServerWindowObserver* observer);
   bool HasObserver(ServerWindowObserver* observer);
 
-  // Creates a new surface of the specified type, replacing the existing.
+  // Creates a new CompositorFrameSink of the specified type, replacing the
+  // existing.
+  // TODO(fsamuel): We should not be passing in |gpu_memory_buffer_manager| and
+  // |context_provider|. The window server should not know anything about them.
+  // Instead, they should be a CompositorFrameSink service-side implementation
+  // detail.
   void CreateCompositorFrameSink(
       mojom::CompositorFrameSinkType compositor_frame_sink_type,
+      gfx::AcceleratedWidget widget,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      scoped_refptr<SurfacesContextProvider> context_provider,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);