[cc] Plumb BeginFrameAcks through SurfaceManager to DisplayScheduler.

content/browser/frame_host/render_widget_host_view_child_frame_unittest.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 "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_external_begin_frame_source.h"
+#include "cc/test/test_begin_frame_ack_tracker.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/fake_renderer_compositor_frame_sink.h"
@@ skipping 203 matching lines @@
 
   // Submit another frame with the same local surface id. The same id should be
   // usable.
   view_->SubmitCompositorFrame(
       kArbitraryLocalSurfaceId,
       CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_EQ(kArbitraryLocalSurfaceId, GetLocalSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 }
 
-// TODO(eseckler): Add back tests for BeginFrameAck forwarding through
-// RenderWidgetHostViewChildFrame and CompositorFrameSinkSupport when we add
-// plumbing of BeginFrameAcks through SurfaceObservers.
+// Tests that BeginFrameAcks are forwarded correctly from the

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

nit: We don't need this test because we're already testing this for CFSSupport.

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

Done. (see DirectCFS comment)

+// SwapCompositorFrame and DidNotProduceFrame IPCs through the
+// CompositorFrameSinkSupport.
+TEST_F(RenderWidgetHostViewChildFrameTest, ForwardsBeginFrameAcks) {
+  gfx::Size view_size(100, 100);
+  gfx::Rect view_rect(view_size);
+  float scale_factor = 1.f;
+
+  view_->SetSize(view_size);
+  view_->Show();
+  view_->SetNeedsBeginFrames(true);
+
+  cc::TestBeginFrameAckTracker ack_tracker;
+  view_->support_->surface_manager()->AddObserver(&ack_tracker);
+
+  {
+    // Ack from CompositorFrame is forwarded.
+    cc::BeginFrameAck ack(0, 5, 4, true);
+    cc::CompositorFrame frame =
+        CreateDelegatedFrame(scale_factor, view_size, view_rect);
+    frame.metadata.begin_frame_ack = ack;
+    view_->SubmitCompositorFrame(kArbitraryLocalSurfaceId, std::move(frame));
+    EXPECT_EQ(ack, ack_tracker.last_ack());
+  }
+
+  {
+    // Explicit ack through OnDidNotProduceFrame is forwarded.
+    cc::BeginFrameAck ack(0, 6, 4, false);
+    view_->OnDidNotProduceFrame(ack);
+    EXPECT_EQ(ack, ack_tracker.last_ack());
+  }
+
+  view_->support_->surface_manager()->RemoveObserver(&ack_tracker);
+  view_->SetNeedsBeginFrames(false);
+}
 
 }  // namespace content