Mus+Ash: ServerWindowCompositorFrameSink => GpuCompositorFrameSink

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/ws/ids.h"
 #include "services/ui/ws/server_window.h"
-#include "services/ui/ws/server_window_compositor_frame_sink.h"
 #include "services/ui/ws/server_window_delegate.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowCompositorFrameSinkManager::ServerWindowCompositorFrameSinkManager(
     ServerWindow* window)
     : window_(window),
       waiting_for_initial_frames_(
           window_->properties().count(ui::mojom::kWaitForUnderlay_Property) >
@@ skipping 30 matching lines @@
   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.
   mojo::MakeStrongBinding(
-      base::MakeUnique<ServerWindowCompositorFrameSink>(
+      base::MakeUnique<GpuCompositorFrameSink>(
           window_->delegate()->GetDisplayCompositor(), frame_sink_id, widget,
           gpu_memory_buffer_manager, std::move(context_provider),
           std::move(request), std::move(client)),
       std::move(private_request));
   if (window_->parent()) {
     window_->delegate()
         ->GetRootWindow(window_)
         ->GetOrCreateCompositorFrameSinkManager()
         ->AddChildFrameSinkId(mojom::CompositorFrameSinkType::DEFAULT,
                               frame_sink_id);
@@ skipping 54 matching lines @@
 
 void ServerWindowCompositorFrameSinkManager::SetLatestSurfaceInfo(
     mojom::CompositorFrameSinkType type,
     const cc::SurfaceId& surface_id,
     const gfx::Size& frame_size) {
   CompositorFrameSinkData& data = type_to_compositor_frame_sink_map_[type];
   data.latest_submitted_surface_id = surface_id;
   data.latest_submitted_frame_size = frame_size;
 }
 
-cc::SurfaceManager*
-ServerWindowCompositorFrameSinkManager::GetCompositorFrameSinkManager() {
-  return window()->delegate()->GetDisplayCompositor()->manager();
-}
-
 bool ServerWindowCompositorFrameSinkManager::
     IsCompositorFrameSinkReadyAndNonEmpty(
         mojom::CompositorFrameSinkType type) const {
   auto iter = type_to_compositor_frame_sink_map_.find(type);
   if (iter == type_to_compositor_frame_sink_map_.end())
     return false;
   if (iter->second.latest_submitted_frame_size.IsEmpty())
     return false;
   const gfx::Size& latest_submitted_frame_size =
       iter->second.latest_submitted_frame_size;
@@ skipping 12 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