Mus+Ash: Towards Unifying CompositorFrameSink terminology

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.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/renderer_host/offscreen_canvas_compositor_frame_sink.h"
 
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ skipping 23 matching lines @@
 void OffscreenCanvasCompositorFrameSink::Create(
     const cc::SurfaceId& surface_id,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::MojoCompositorFrameSinkRequest request) {
   mojo::MakeStrongBinding(base::MakeUnique<OffscreenCanvasCompositorFrameSink>(
                               surface_id, std::move(client)),
                           std::move(request));
 }
 
 void OffscreenCanvasCompositorFrameSink::SubmitCompositorFrame(
-    cc::CompositorFrame frame,
-    const SubmitCompositorFrameCallback& callback) {
+    cc::CompositorFrame frame) {
   if (!surface_factory_) {
     cc::SurfaceManager* manager = GetSurfaceManager();
     surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
         surface_id_.frame_sink_id(), manager, this);
     surface_factory_->Create(surface_id_.local_frame_id());
 
     manager->RegisterFrameSinkId(surface_id_.frame_sink_id());
   }
-  surface_factory_->SubmitCompositorFrame(surface_id_.local_frame_id(),
-                                          std::move(frame), callback);
+  surface_factory_->SubmitCompositorFrame(
+      surface_id_.local_frame_id(), std::move(frame),
+      base::Bind(
+          &OffscreenCanvasCompositorFrameSink::DidReceiveCompositorFrameAck,
+          base::Unretained(this)));
 }
 
 void OffscreenCanvasCompositorFrameSink::SetNeedsBeginFrame(
     bool needs_begin_frame) {
   NOTIMPLEMENTED();
 }
 
 void OffscreenCanvasCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
-  client_->ReturnResources(resources);
+  client_->ReclaimResources(resources);
 }
 
 void OffscreenCanvasCompositorFrameSink::WillDrawSurface(
     const cc::LocalFrameId& id,
     const gfx::Rect& damage_rect) {}
 
 void OffscreenCanvasCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {}
 
+void OffscreenCanvasCompositorFrameSink::DidReceiveCompositorFrameAck() {
+  client_->DidReceiveCompositorFrameAck();
+}
+
 }  // namespace content