[cc] Add and plumb CFS::DidNotProduceFrame.

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index cf106d34919191d3b55dc944749d2678d835fb39..81d728db105993c509456fa88b30f86d62b57a3a 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1200,7 +1200,7 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     DestroyDelegatedContent();
 
     ack.has_damage = false;
-    OnBeginFrameDidNotSwap(ack);
+    OnBeginFrameDidNotProduceFrame(ack);
   } else {
     delegated_frame_host_->SubmitCompositorFrame(local_surface_id,
                                                  std::move(frame));
@@ -1231,8 +1231,14 @@ void RenderWidgetHostViewAndroid::DestroyDelegatedContent() {
   delegated_frame_host_->DestroyDelegatedContent();
 }
 
-void RenderWidgetHostViewAndroid::OnBeginFrameDidNotSwap(
+void RenderWidgetHostViewAndroid::OnBeginFrameDidNotProduceFrame(
     const cc::BeginFrameAck& ack) {
+  if (!delegated_frame_host_) {

[sunnyps, 2017/05/22 07:17:13]

nit: Can you add a comment about this?

[Eric Seckler, 2017/05/22 11:29:58]

Done.

+    DCHECK(!using_browser_compositor_);
+    return;
+  }
+
+  delegated_frame_host_->BeginFrameDidNotProduceFrame(ack);
   AcknowledgeBeginFrame(ack);
 }
 
@@ -2060,7 +2066,7 @@ void RenderWidgetHostViewAndroid::OnDetachCompositor() {
 void RenderWidgetHostViewAndroid::OnBeginFrame(const cc::BeginFrameArgs& args) {
   TRACE_EVENT0("cc,benchmark", "RenderWidgetHostViewAndroid::OnBeginFrame");
   if (!host_) {
-    OnBeginFrameDidNotSwap(
+    OnBeginFrameDidNotProduceFrame(
         cc::BeginFrameAck(args.source_id, args.sequence_number,
                           cc::BeginFrameArgs::kInvalidFrameNumber, false));
     return;
@@ -2073,7 +2079,7 @@ void RenderWidgetHostViewAndroid::OnBeginFrame(const cc::BeginFrameArgs& args) {
     uint64_t confirmed = cc::BeginFrameArgs::kInvalidFrameNumber;
     if (args.source_id == latest_confirmed_begin_frame_source_id_)
       confirmed = latest_confirmed_begin_frame_sequence_number_;
-    OnBeginFrameDidNotSwap(cc::BeginFrameAck(
+    OnBeginFrameDidNotProduceFrame(cc::BeginFrameAck(
         args.source_id, args.sequence_number, confirmed, false));
     return;
   }
@@ -2097,7 +2103,7 @@ void RenderWidgetHostViewAndroid::OnBeginFrame(const cc::BeginFrameArgs& args) {
     ClearBeginFrameRequest(BEGIN_FRAME);
     SendBeginFrame(args);
   } else {
-    OnBeginFrameDidNotSwap(cc::BeginFrameAck(
+    OnBeginFrameDidNotProduceFrame(cc::BeginFrameAck(
         args.source_id, args.sequence_number, args.sequence_number, false));
   }
 }