[cc] Add and plumb CFS::DidNotProduceFrame.

content/renderer/gpu/renderer_compositor_frame_sink.cc

 // Copyright (c) 2012 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/renderer/gpu/renderer_compositor_frame_sink.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 105 matching lines @@
   compositor_frame_sink_filter_->RemoveHandlerOnCompositorThread(
       routing_id_, compositor_frame_sink_filter_handler_);
   sink_.reset();
   sink_client_binding_.Close();
   cc::CompositorFrameSink::DetachFromClient();
 }
 
 void RendererCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   // We should only submit CompositorFrames with valid BeginFrameAcks.
+  DCHECK(frame.metadata.begin_frame_ack.has_damage);
   DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber,
             frame.metadata.begin_frame_ack.sequence_number);
   if (ShouldAllocateNewLocalSurfaceId(frame))
     local_surface_id_ = id_allocator_.GenerateId();
   UpdateFrameData(frame);
 
   {
     std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
         send_message_scope =
             frame_swap_message_queue_->AcquireSendMessageScope();
     std::vector<std::unique_ptr<IPC::Message>> messages;
     frame_swap_message_queue_->DrainMessages(&messages);
     std::vector<IPC::Message> messages_to_send;
     FrameSwapMessageQueue::TransferMessages(&messages, &messages_to_send);
     uint32_t frame_token = 0;
     if (!messages_to_send.empty())
       frame_token = frame_swap_message_queue_->AllocateFrameToken();
     frame.metadata.frame_token = frame_token;
     sink_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
     if (frame_token) {
       message_sender_->Send(new ViewHostMsg_FrameSwapMessages(
           routing_id_, frame_token, messages_to_send));
     }
     // ~send_message_scope.
   }
 }
 
+void RendererCompositorFrameSink::BeginFrameDidNotProduceFrame(
+    const cc::BeginFrameAck& ack) {
+  DCHECK(!ack.has_damage);
+  DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number);
+  sink_->BeginFrameDidNotProduceFrame(ack);
+}
+
 void RendererCompositorFrameSink::OnMessageReceived(
     const IPC::Message& message) {
   DCHECK(thread_checker_.CalledOnValidThread());
   IPC_BEGIN_MESSAGE_MAP(RendererCompositorFrameSink, message)
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrameIPC)
   IPC_END_MESSAGE_MAP()
 }
 
 void RendererCompositorFrameSink::OnBeginFrameIPC(
     const cc::BeginFrameArgs& args) {
@@ skipping 61 matching lines @@
 
 void RendererCompositorFrameSink::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
 void RendererCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frames) {
   sink_->SetNeedsBeginFrame(needs_begin_frames);
 }
 
-void RendererCompositorFrameSink::OnDidFinishFrame(
-    const cc::BeginFrameAck& ack) {
-  DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber, ack.sequence_number);
-  // If there was damage, ViewHostMsg_SwapCompositorFrame includes the ack.
-  if (!ack.has_damage)
-    sink_->BeginFrameDidNotSwap(ack);
-}
-
 void RendererCompositorFrameSink::EstablishMojoConnection() {
   cc::mojom::MojoCompositorFrameSinkPtr sink;
   cc::mojom::MojoCompositorFrameSinkRequest sink_request =
       mojo::MakeRequest(&sink);
   cc::mojom::MojoCompositorFrameSinkClientPtr sink_client;
   sink_client_request_ = mojo::MakeRequest(&sink_client);
   RenderThreadImpl::current()->GetFrameSinkProvider()->CreateForWidget(
       routing_id_, std::move(sink_request), std::move(sink_client));
   sink_ptr_info_ = sink.PassInterface();
 }
 
 }  // namespace content