[cc] Fix CompositorFrameSinkSupport BeginFrameAck interface.

services/ui/public/cpp/client_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/client_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "cc/base/switches.h"
+#include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
 
 namespace ui {
 
 // static
 std::unique_ptr<ClientCompositorFrameSink> ClientCompositorFrameSink::Create(
     const cc::FrameSinkId& frame_sink_id,
     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
@@ skipping 49 matching lines @@
   local_surface_id_ = local_surface_id;
 }
 
 void ClientCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   DCHECK(thread_checker_);
   DCHECK(thread_checker_->CalledOnValidThread());
   if (!compositor_frame_sink_)
     return;
 
+  DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber,
+            frame.metadata.begin_frame_ack.sequence_number);
+
   gfx::Size frame_size = last_submitted_frame_size_;
   if (!frame.render_pass_list.empty())
     frame_size = frame.render_pass_list.back()->output_rect.size();
   if (!enable_surface_synchronization_ &&
       (!local_surface_id_.is_valid() ||
        frame_size != last_submitted_frame_size_)) {
     local_surface_id_ = id_allocator_.GenerateId();
   }
   compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_,
                                                 std::move(frame));
@@ skipping 44 matching lines @@
     const cc::LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {
   // TODO(fsamuel, staraz): Implement this.
 }
 
 void ClientCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) {
   compositor_frame_sink_->SetNeedsBeginFrame(needs_begin_frames);
 }
 
 void ClientCompositorFrameSink::OnDidFinishFrame(const cc::BeginFrameAck& ack) {
-  // TODO(eseckler): Pass on the ack to compositor_frame_sink_.
+  // If there was damage, the submitted CompositorFrame includes the ack.
+  if (!ack.has_damage)
+    compositor_frame_sink_->BeginFrameDidNotSwap(ack);
 }
 
 ClientCompositorFrameSinkBinding::~ClientCompositorFrameSinkBinding() {}
 
 ClientCompositorFrameSinkBinding::ClientCompositorFrameSinkBinding(
     cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink_request,
     cc::mojom::MojoCompositorFrameSinkClientPtrInfo
         compositor_frame_sink_client)
     : compositor_frame_sink_request_(std::move(compositor_frame_sink_request)),
       compositor_frame_sink_client_(std::move(compositor_frame_sink_client)) {}
 
 cc::mojom::MojoCompositorFrameSinkRequest
 ClientCompositorFrameSinkBinding::TakeFrameSinkRequest() {
   return std::move(compositor_frame_sink_request_);
 }
 
 cc::mojom::MojoCompositorFrameSinkClientPtrInfo
 ClientCompositorFrameSinkBinding::TakeFrameSinkClient() {
   return std::move(compositor_frame_sink_client_);
 }
 
 }  // namespace ui