Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window_compositor_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_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "cc/ipc/compositor_frame.mojom.h"
+#include "cc/output/context_provider.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_sequence_generator.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
+#include "services/ui/surfaces/surfaces_context_provider.h"
+
+namespace gpu {
+class GpuMemoryBufferManager;
+}
 
 namespace ui {
 namespace ws {
 
 class ServerWindow;
 class ServerWindowCompositorFrameSink;
 class ServerWindowCompositorFrameSinkManagerTestApi;
 
 struct CompositorFrameSinkData {
   CompositorFrameSinkData();
@@ skipping 16 matching lines @@
   explicit ServerWindowCompositorFrameSinkManager(ServerWindow* window);
   ~ServerWindowCompositorFrameSinkManager();
 
   // Returns true if the surfaces from this manager should be drawn.
   bool ShouldDraw();
 
   // Creates a new surface of the specified type, replacing the existing one of
   // the specified type.
   void CreateCompositorFrameSink(
       mojom::CompositorFrameSinkType surface_type,
-      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+      gfx::AcceleratedWidget widget,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      scoped_refptr<SurfacesContextProvider> context_provider,
+      cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   ServerWindow* window() { return window_; }
 
   ServerWindowCompositorFrameSink* GetDefaultCompositorFrameSink() const;
   ServerWindowCompositorFrameSink* GetUnderlayCompositorFrameSink() const;
   ServerWindowCompositorFrameSink* GetCompositorFrameSinkByType(
       mojom::CompositorFrameSinkType type) const;
   bool HasCompositorFrameSinkOfType(mojom::CompositorFrameSinkType type) const;
   bool HasAnyCompositorFrameSink() const;
@@ skipping 33 matching lines @@
   // the underlay is not necessarily as big as the window.
   bool waiting_for_initial_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindowCompositorFrameSinkManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_MANAGER_H_