Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window.h

 // Copyright 2014 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_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 39 matching lines @@
   ServerWindow(ServerWindowDelegate* delegate, const WindowId& id);
   ServerWindow(ServerWindowDelegate* delegate,
                const WindowId& id,
                const Properties& properties);
   ~ServerWindow();
 
   void AddObserver(ServerWindowObserver* observer);
   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);
 
   const WindowId& id() const { return id_; }
 
   void Add(ServerWindow* child);
   void Remove(ServerWindow* child);
   void Reorder(ServerWindow* relative, mojom::OrderDirection diretion);
   void StackChildAtBottom(ServerWindow* child);
   void StackChildAtTop(ServerWindow* child);
@@ skipping 181 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_