cc: Rename SwapBuffers on CompositorFrameSink to SubmitCompositorFrame

services/ui/public/cpp/compositor_frame_sink.cc

 // Copyright 2014 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/public/cpp/compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
@@ skipping 30 matching lines @@
   return true;
 }
 
 void CompositorFrameSink::DetachFromClient() {
   client_->SetBeginFrameSource(nullptr);
   begin_frame_source_.reset();
   surface_.reset();
   cc::CompositorFrameSink::DetachFromClient();
 }
 
-void CompositorFrameSink::SwapBuffers(cc::CompositorFrame frame) {
+void CompositorFrameSink::SubmitCompositorFrame(cc::CompositorFrame frame) {
   // CompositorFrameSink owns WindowSurface, and so if CompositorFrameSink is
   // destroyed then SubmitCompositorFrame's callback will never get called.
-  // Thus, base::Unretained is safe here.
+  // Thus, base::Unretained is safe here as |client_| is valid as long as |this|
+  // is.
   surface_->SubmitCompositorFrame(
-      std::move(frame), base::Bind(&CompositorFrameSink::SwapBuffersComplete,
-                                   base::Unretained(this)));
+      std::move(frame),
+      base::Bind(&cc::CompositorFrameSinkClient::DidReceiveCompositorFrameAck,
+                 base::Unretained(client_)));
 }
 
 void CompositorFrameSink::OnResourcesReturned(
     ui::WindowSurface* surface,
     const cc::ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
-void CompositorFrameSink::SwapBuffersComplete() {
-  client_->DidSwapBuffersComplete();
-}
-
 }  // namespace ui