Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window_compositor_frame_sink_manager.cc

 // 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.
 
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink.h"
@@ skipping 22 matching lines @@
 
   waiting_for_initial_frames_ = !IsCompositorFrameSinkReadyAndNonEmpty(
                                     mojom::CompositorFrameSinkType::DEFAULT) ||
                                 !IsCompositorFrameSinkReadyAndNonEmpty(
                                     mojom::CompositorFrameSinkType::UNDERLAY);
   return !waiting_for_initial_frames_;
 }
 
 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink(
     mojom::CompositorFrameSinkType compositor_frame_sink_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) {
   cc::FrameSinkId frame_sink_id(
       WindowIdToTransportId(window_->id()),
       static_cast<uint32_t>(compositor_frame_sink_type));
   CompositorFrameSinkData& data =
       type_to_compositor_frame_sink_map_[compositor_frame_sink_type];
+  // TODO(fsamuel): Create the CompositorFrameSink through the DisplayCompositor
+  // mojo interface and hold on to a MojoCompositorFrameSinkPtr.
   data.compositor_frame_sink =
       base::MakeUnique<ServerWindowCompositorFrameSink>(
-          this, frame_sink_id, std::move(request), std::move(client));
+          this, frame_sink_id, widget, gpu_memory_buffer_manager,
+          std::move(context_provider), std::move(request), std::move(client));
   data.surface_sequence_generator.set_frame_sink_id(frame_sink_id);
 }
 
 ServerWindowCompositorFrameSink*
 ServerWindowCompositorFrameSinkManager::GetDefaultCompositorFrameSink() const {
   return GetCompositorFrameSinkByType(mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 ServerWindowCompositorFrameSink*
 ServerWindowCompositorFrameSinkManager::GetUnderlayCompositorFrameSink() const {
@@ skipping 85 matching lines @@
 
 CompositorFrameSinkData& CompositorFrameSinkData::operator=(
     CompositorFrameSinkData&& other) {
   latest_submitted_surface_id = other.latest_submitted_surface_id;
   compositor_frame_sink = std::move(other.compositor_frame_sink);
   return *this;
 }
 
 }  // namespace ws
 }  // namespace ui