Introduce Display Compositor mojo interface. Use InProcessContextProvider.

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 "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/surfaces/display_compositor.h"
-#include "services/ui/ws/gpu_compositor_frame_sink.h"
+#include "services/ui/surfaces/gpu_compositor_frame_sink.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_delegate.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowCompositorFrameSinkManager::ServerWindowCompositorFrameSinkManager(
     ServerWindow* window)
     : window_(window),
@@ skipping 12 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,
     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];
-
   cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request;
   if (data.pending_compositor_frame_sink_request.is_pending()) {
     private_request = std::move(data.pending_compositor_frame_sink_request);
   } else {
     private_request = mojo::GetProxy(&data.compositor_frame_sink);
   }
 
-  // TODO(fsamuel): Create the CompositorFrameSink through the DisplayCompositor
-  // mojo interface.
-  data.compositor_frame_sink_impl_ = base::MakeUnique<GpuCompositorFrameSink>(
-      window_->delegate()->GetDisplayCompositor(), frame_sink_id, widget,
-      gpu_memory_buffer_manager, std::move(context_provider),
-      std::move(request), std::move(private_request), std::move(client));
+  // TODO(fsamuel): AcceleratedWidget cannot be transported over IPC for Mac or
+  // Android. We should instead use GpuSurfaceTracker here on those platforms.
+  window_->delegate()->GetDisplayCompositor()->CreateCompositorFrameSink(
+      frame_sink_id, widget, std::move(request), std::move(private_request),
+      std::move(client));
+
   if (window_->parent()) {
     window_->delegate()
         ->GetRootWindow(window_)
         ->GetOrCreateCompositorFrameSinkManager()
         ->AddChildFrameSinkId(mojom::CompositorFrameSinkType::DEFAULT,
                               frame_sink_id);
   }
 }
 
 void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId(
@@ skipping 82 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