Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

content/browser/compositor/mus_browser_compositor_output_surface.cc

 // Copyright 2016 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 "content/browser/compositor/mus_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
-#include "services/ui/public/cpp/compositor_frame_sink.h"
 #include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_surface.h"
+#include "services/ui/public/cpp/window_compositor_frame_sink.h"
 
 namespace content {
 
 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
     ui::Window* window,
     scoped_refptr<ContextProviderCommandBuffer> context,
     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
     cc::SyntheticBeginFrameSource* begin_frame_source,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
     : GpuBrowserCompositorOutputSurface(std::move(context),
                                         std::move(vsync_manager),
                                         begin_frame_source,
                                         std::move(overlay_candidate_validator)),
       ui_window_(window) {
   ui_compositor_frame_sink_ = ui_window_->RequestCompositorFrameSink(
-      ui::mojom::SurfaceType::DEFAULT, context);
+      ui::mojom::CompositorFrameSinkType::DEFAULT, context);
 }
 
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
   const gfx::Rect bounds(ui_window_->bounds().size());
   cc::CompositorFrame ui_frame;
   ui_frame.metadata.latency_info = std::move(frame.latency_info);
   // Reset latency_info to known empty state after moving contents.
@@ skipping 129 matching lines @@
 
 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
     uint32_t id) {
   DCHECK_LT(id, mailboxes_.size());
   DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
          free_resource_ids_.end());
   return mailboxes_[id];
 }
 
 }  // namespace content