Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/ws/server_window_surface.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_surface.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/shared_quad_state.h"
 #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_delegate.h"
 #include "services/ui/ws/server_window_surface_manager.h"
 
 namespace ui {
 namespace ws {
 
 ServerWindowSurface::ServerWindowSurface(
     ServerWindowSurfaceManager* manager,
     const cc::FrameSinkId& frame_sink_id,
-    mojo::InterfaceRequest<Surface> request,
-    mojom::SurfaceClientPtr client)
+    cc::mojom::MojoCompositorFrameSinkRequest request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client)
     : frame_sink_id_(frame_sink_id),
       manager_(manager),
       surface_factory_(frame_sink_id_, manager_->GetSurfaceManager(), this),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
   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() {
   // 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();
   surface_manager->UnregisterSurfaceFactoryClient(frame_sink_id_);
   surface_manager->InvalidateFrameSinkId(frame_sink_id_);
 }
 
-void ServerWindowSurface::SubmitCompositorFrame(
-    cc::CompositorFrame frame,
-    const SubmitCompositorFrameCallback& callback) {
+void ServerWindowSurface::SetNeedsBeginFrame(bool needs_begin_frame) {

[rjkroege, 2016/10/20 21:33:18]

if it works without it, then why is it needed? What's optional for clients needs
to be explained in the .mojom

[Fady Samuel, 2016/10/20 23:04:10]

We don't use unified BeginFrame in Mus yet. staraz@ is working on that. Each
client ticks independently currently. This will be used by staraz's patch.

+  // TODO(fsamuel): Implement this.
+}
+
+void ServerWindowSurface::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
   // Surface and create a new one of the appropriate size.
   if (local_frame_id_.is_null() || frame_size != last_submitted_frame_size_) {
     if (!local_frame_id_.is_null())
       surface_factory_.Destroy(local_frame_id_);
     local_frame_id_ = surface_id_allocator_.GenerateId();
     surface_factory_.Create(local_frame_id_);
   }
   may_contain_video_ = frame.metadata.may_contain_video;
-  surface_factory_.SubmitCompositorFrame(local_frame_id_, std::move(frame),
-                                         callback);
+  surface_factory_.SubmitCompositorFrame(
+      local_frame_id_, std::move(frame),
+      base::Bind(&ServerWindowSurface::DidReceiveCompositorFrameAck,
+                 base::Unretained(this)));
   last_submitted_frame_size_ = frame_size;
   window()->delegate()->OnScheduleWindowPaint(window());
 }
 
 cc::SurfaceId ServerWindowSurface::GetSurfaceId() const {
   if (local_frame_id_.is_null())
     return cc::SurfaceId();
   return cc::SurfaceId(frame_sink_id_, local_frame_id_);
 }
 
 cc::SurfaceSequence ServerWindowSurface::CreateSurfaceSequence() {
   return surface_sequence_generator_.CreateSurfaceSequence();
 }
 
 ServerWindow* ServerWindowSurface::window() {
   return manager_->window();
 }
 
+void ServerWindowSurface::DidReceiveCompositorFrameAck() {

[rjkroege, 2016/10/20 21:33:18]

You are deleting ServerWindowSurface in a subsequent CL right?

[Fady Samuel, 2016/10/20 23:04:10]

Not quite. ServerWindowSurface => ServerWindowCompositorFrameSink.

+  if (!client_ || !base::MessageLoop::current())
+    return;
+  client_->DidReceiveCompositorFrameAck();
+}
+
 void ServerWindowSurface::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (!client_ || !base::MessageLoop::current())
     return;
-  client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources));
+  client_->ReclaimResources(resources);
 }
 
 void ServerWindowSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Implement this.
 }
 
 }  // namespace ws
 }  // namespace ui