[cc] Add and plumb CFS::DidNotProduceFrame.

content/browser/renderer_host/render_widget_host_view_aura_unittest.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/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 3056 matching lines @@
   void OnAddObserver(cc::BeginFrameObserver* obs) override {
     last_observer_ = obs;
   }
   void OnRemoveObserver(cc::BeginFrameObserver* obs) override {}
 
   cc::BeginFrameObserver* last_observer_ = nullptr;
 };
 }  // namespace
 
 // Tests that BeginFrameAcks are forwarded correctly from the
-// SwapCompositorFrame and OnBeginFrameDidNotSwap IPCs through
+// SwapCompositorFrame and OnBeginFrameDidNotProduceFrame IPCs through
 // DelegatedFrameHost and its CompositorFrameSinkSupport.
 TEST_F(RenderWidgetHostViewAuraTest, ForwardsBeginFrameAcks) {
   gfx::Rect view_rect(100, 100);
   gfx::Size frame_size = view_rect.size();
 
   view_->InitAsChild(nullptr);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_rect.size());
@@ skipping 27 matching lines @@
     view_->SubmitCompositorFrame(kArbitraryLocalSurfaceId, std::move(frame));
     view_->RunOnCompositingDidCommit();
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   {
     cc::BeginFrameArgs args =
         cc::CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, source_id, 6u);
     source.TestOnBeginFrame(args);
 
-    // Explicit ack through OnBeginFrameDidNotSwap is forwarded.
+    // Explicit ack through OnBeginFrameDidNotProduceFrame is forwarded.
     cc::BeginFrameAck ack(source_id, 6, 4, false);
-    view_->OnBeginFrameDidNotSwap(ack);
+    view_->OnBeginFrameDidNotProduceFrame(ack);
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   // Lock the compositor. Now we should drop frames and, thus,
   // latest_confirmed_sequence_number should not change.
   view_rect = gfx::Rect(150, 150);
   view_->SetSize(view_rect.size());
 
   {
     cc::BeginFrameArgs args =
@@ skipping 36 matching lines @@
         cc::BeginFrameArgs::kInvalidFrameNumber;
     ack.has_damage = false;
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   {
     cc::BeginFrameArgs args = cc::CreateBeginFrameArgsForTesting(
         BEGINFRAME_FROM_HERE, source_id, 11u);
     source.TestOnBeginFrame(args);
 
-    // Explicit ack through OnBeginFrameDidNotSwap is forwarded with invalid
-    // latest_confirmed_sequence_number.
+    // Explicit ack through OnBeginFrameDidNotProduceFrame is forwarded with
+    // invalid latest_confirmed_sequence_number.
     cc::BeginFrameAck ack(source_id, 11, 11, false);
-    view_->OnBeginFrameDidNotSwap(ack);
+    view_->OnBeginFrameDidNotProduceFrame(ack);
     ack.latest_confirmed_sequence_number =
         cc::BeginFrameArgs::kInvalidFrameNumber;
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   // Unlock the compositor again with a new CompositorFrame of correct size.
   frame_size = view_rect.size();
 
   {
     cc::BeginFrameArgs args = cc::CreateBeginFrameArgsForTesting(
         BEGINFRAME_FROM_HERE, source_id, 12u);
     source.TestOnBeginFrame(args);
 
     // Ack from CompositorFrame is forwarded.
     cc::BeginFrameAck ack(source_id, 12, 12, true);
     cc::CompositorFrame frame = MakeDelegatedFrame(1.f, frame_size, view_rect);
     frame.metadata.begin_frame_ack = ack;
     view_->SubmitCompositorFrame(kArbitraryLocalSurfaceId, std::move(frame));
     view_->RunOnCompositingDidCommit();
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   {
     cc::BeginFrameArgs args = cc::CreateBeginFrameArgsForTesting(
         BEGINFRAME_FROM_HERE, source_id, 13u);
     source.TestOnBeginFrame(args);
 
-    // Explicit ack through OnBeginFrameDidNotSwap is forwarded.
+    // Explicit ack through OnBeginFrameDidNotProduceFrame is forwarded.
     cc::BeginFrameAck ack(source_id, 13, 13, false);
-    view_->OnBeginFrameDidNotSwap(ack);
+    view_->OnBeginFrameDidNotProduceFrame(ack);
     EXPECT_EQ(ack, source.LastAckForObserver(observer_tracker.last_observer_));
   }
 
   surface_manager->UnregisterBeginFrameSource(&source);
 }
 
 class RenderWidgetHostViewAuraCopyRequestTest
     : public RenderWidgetHostViewAuraShutdownTest {
  public:
   RenderWidgetHostViewAuraCopyRequestTest()
@@ skipping 2319 matching lines @@
     // There is no composition in the beginning.
     EXPECT_FALSE(has_composition_text());
     SetHasCompositionTextToTrue();
     view->ImeCancelComposition();
     // The composition must have been canceled.
     EXPECT_FALSE(has_composition_text());
   }
 }
 
 }  // namespace content