[cc] Plumb BeginFrameAcks through SurfaceManager to DisplayScheduler.

cc/surfaces/direct_compositor_frame_sink_unittest.cc

 // Copyright 2015 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 "cc/surfaces/direct_compositor_frame_sink.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/fake_compositor_frame_sink_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/ordered_simple_task_runner.h"
+#include "cc/test/test_begin_frame_ack_tracker.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 
 class TestDirectCompositorFrameSink : public DirectCompositorFrameSink {
  public:
   using DirectCompositorFrameSink::DirectCompositorFrameSink;
 
   CompositorFrameSinkSupport* support() const { return support_.get(); }
 };
 
 class DirectCompositorFrameSinkTest : public testing::Test {
  public:
   DirectCompositorFrameSinkTest()
       : now_src_(new base::SimpleTestTickClock()),
         task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
         display_size_(1920, 1080),
         display_rect_(display_size_),
         context_provider_(TestContextProvider::Create()) {
     surface_manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
+    surface_manager_.AddObserver(&ack_tracker_);
 
     std::unique_ptr<FakeOutputSurface> display_output_surface =
         FakeOutputSurface::Create3d();
     display_output_surface_ = display_output_surface.get();
 
     begin_frame_source_.reset(new BackToBackBeginFrameSource(
         base::MakeUnique<DelayBasedTimeSource>(task_runner_.get())));
 
     int max_frames_pending = 2;
     std::unique_ptr<DisplayScheduler> scheduler(
@@ skipping 12 matching lines @@
     compositor_frame_sink_->BindToClient(&compositor_frame_sink_client_);
     display_->Resize(display_size_);
     display_->SetVisible(true);
 
     EXPECT_FALSE(
         compositor_frame_sink_client_.did_lose_compositor_frame_sink_called());
   }
 
   ~DirectCompositorFrameSinkTest() override {
     compositor_frame_sink_->DetachFromClient();
+    surface_manager_.RemoveObserver(&ack_tracker_);
   }
 
   void SwapBuffersWithDamage(const gfx::Rect& damage_rect) {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     render_pass->SetNew(1, display_rect_, damage_rect, gfx::Transform());
 
     CompositorFrame frame = test::MakeEmptyCompositorFrame();
     frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, true);
     frame.render_pass_list.push_back(std::move(render_pass));
 
@@ skipping 18 matching lines @@
   SurfaceManager surface_manager_;
   TestSharedBitmapManager bitmap_manager_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
 
   scoped_refptr<TestContextProvider> context_provider_;
   FakeOutputSurface* display_output_surface_ = nullptr;
   std::unique_ptr<BackToBackBeginFrameSource> begin_frame_source_;
   std::unique_ptr<Display> display_;
   FakeCompositorFrameSinkClient compositor_frame_sink_client_;
   std::unique_ptr<TestDirectCompositorFrameSink> compositor_frame_sink_;
+  TestBeginFrameAckTracker ack_tracker_;
 };
 
 TEST_F(DirectCompositorFrameSinkTest, DamageTriggersSwapBuffers) {
   SwapBuffersWithDamage(display_rect_);
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(2u, display_output_surface_->num_sent_frames());
 }
 
 TEST_F(DirectCompositorFrameSinkTest, NoDamageDoesNotTriggerSwapBuffers) {
@@ skipping 11 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   SwapBuffersWithDamage(display_rect_);
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   display_output_surface_->set_suspended_for_recycle(false);
   SwapBuffersWithDamage(display_rect_);
   task_runner_->RunUntilIdle();
   EXPECT_EQ(2u, display_output_surface_->num_sent_frames());
 }
 
-// TODO(eseckler): Add back tests for BeginFrameAck forwarding through
-// DirectCompositorFrameSink and CompositorFrameSinkSupport when we add plumbing
-// of BeginFrameAcks through SurfaceObservers.
+TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithDamage) {

[sunnyps, 2017/05/25 20:49:13]

nit: I don't think we need this test here because we're already testing it for
CFSSupport.

[Eric Seckler, 2017/05/26 10:57:52]

Done. (You're right, the only additional behavior tested here is the forwarding
of acks on CompositorFrame and DidNotProduceFrame messages in DirectCFS, for
which we can also just rely on integration tests.)

+  // Verify that the frame sink forwards the BeginFrameAck attached to
+  // CompositorFrame submitted during SetUp().
+  EXPECT_EQ(BeginFrameAck(0, 1, 1, true), ack_tracker_.last_ack());
+}
+
+TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithoutDamage) {
+  // Verify that the frame sink forwards the BeginFrameAck from
+  // DidNotProduceFrame().
+  BeginFrameAck ack(0, 2, 2, false);
+  compositor_frame_sink_->DidNotProduceFrame(ack);
+  EXPECT_EQ(ack, ack_tracker_.last_ack());
+}
 
 }  // namespace
 }  // namespace cc