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

services/ui/ws/server_window_compositor_frame_sink.cc

Index: services/ui/ws/server_window_compositor_frame_sink.cc
diff --git a/services/ui/ws/server_window_surface.cc b/services/ui/ws/server_window_compositor_frame_sink.cc
similarity index 68%
rename from services/ui/ws/server_window_surface.cc
rename to services/ui/ws/server_window_compositor_frame_sink.cc
index 5f0e3b5465f1ae4bc9cdff4f95740b2e7384a7b3..1b8a6b06aaacb73f59116707f9b09f6a804a659c 100644
--- a/services/ui/ws/server_window_surface.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink.cc
@@ -2,7 +2,7 @@
 // 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_surface.h"
+#include "services/ui/ws/server_window_compositor_frame_sink.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ -11,43 +11,49 @@
 #include "cc/quads/surface_draw_quad.h"
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/server_window.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/server_window_delegate.h"
-#include "services/ui/ws/server_window_surface_manager.h"
 
 namespace ui {
 namespace ws {
 
-ServerWindowSurface::ServerWindowSurface(
-    ServerWindowSurfaceManager* manager,
+ServerWindowCompositorFrameSink::ServerWindowCompositorFrameSink(
+    ServerWindowCompositorFrameSinkManager* manager,
     const cc::FrameSinkId& frame_sink_id,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
     : frame_sink_id_(frame_sink_id),
       manager_(manager),
-      surface_factory_(frame_sink_id_, manager_->GetSurfaceManager(), this),
+      surface_factory_(frame_sink_id_,
+                       manager_->GetCompositorFrameSinkManager(),
+                       this),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
-  cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
+  cc::SurfaceManager* surface_manager =
+      manager_->GetCompositorFrameSinkManager();
   surface_manager->RegisterFrameSinkId(frame_sink_id_);
   surface_manager->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_sequence_generator_.set_frame_sink_id(frame_sink_id_);
 }
 
-ServerWindowSurface::~ServerWindowSurface() {
+ServerWindowCompositorFrameSink::~ServerWindowCompositorFrameSink() {
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_.DestroyAll();
-  cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
+  cc::SurfaceManager* surface_manager =
+      manager_->GetCompositorFrameSinkManager();
   surface_manager->UnregisterSurfaceFactoryClient(frame_sink_id_);
   surface_manager->InvalidateFrameSinkId(frame_sink_id_);
 }
 
-void ServerWindowSurface::SetNeedsBeginFrame(bool needs_begin_frame) {
+void ServerWindowCompositorFrameSink::SetNeedsBeginFrame(
+    bool needs_begin_frame) {
   // TODO(fsamuel): Implement this.
 }
 
-void ServerWindowSurface::SubmitCompositorFrame(cc::CompositorFrame frame) {
+void ServerWindowCompositorFrameSink::SubmitCompositorFrame(
+    cc::CompositorFrame frame) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list[0]->output_rect.size();
   // If the size of the CompostiorFrame has changed then destroy the existing
@@ -61,40 +67,40 @@ void ServerWindowSurface::SubmitCompositorFrame(cc::CompositorFrame frame) {
   may_contain_video_ = frame.metadata.may_contain_video;
   surface_factory_.SubmitCompositorFrame(
       local_frame_id_, std::move(frame),
-      base::Bind(&ServerWindowSurface::DidReceiveCompositorFrameAck,
+      base::Bind(&ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck,
                  base::Unretained(this)));
   last_submitted_frame_size_ = frame_size;
   window()->delegate()->OnScheduleWindowPaint(window());
 }
 
-cc::SurfaceId ServerWindowSurface::GetSurfaceId() const {
+cc::SurfaceId ServerWindowCompositorFrameSink::GetSurfaceId() const {
   if (local_frame_id_.is_null())
     return cc::SurfaceId();
   return cc::SurfaceId(frame_sink_id_, local_frame_id_);
 }
 
-cc::SurfaceSequence ServerWindowSurface::CreateSurfaceSequence() {
+cc::SurfaceSequence ServerWindowCompositorFrameSink::CreateSurfaceSequence() {
   return surface_sequence_generator_.CreateSurfaceSequence();
 }
 
-ServerWindow* ServerWindowSurface::window() {
+ServerWindow* ServerWindowCompositorFrameSink::window() {
   return manager_->window();
 }
 
-void ServerWindowSurface::DidReceiveCompositorFrameAck() {
+void ServerWindowCompositorFrameSink::DidReceiveCompositorFrameAck() {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->DidReceiveCompositorFrameAck();
 }
 
-void ServerWindowSurface::ReturnResources(
+void ServerWindowCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_ || !base::MessageLoop::current())
     return;
   client_->ReclaimResources(resources);
 }
 
-void ServerWindowSurface::SetBeginFrameSource(
+void ServerWindowCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }