Hide compositor_frame_sink_id from RenderWidgetHostView*

content/browser/renderer_host/render_widget_host_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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
 
@@ skipping 477 matching lines @@
   // testing::Test
   void SetUp() override {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     command_line->AppendSwitch(switches::kValidateInputEventStream);
     feature_list_.InitFromCommandLine(
         features::kRafAlignedTouchInputEvents.name, "");
 
     browser_context_.reset(new TestBrowserContext());
     delegate_.reset(new MockRenderWidgetHostDelegate());
     process_ = new RenderWidgetHostProcess(browser_context_.get());
+    sink_ = &process_->sink();
 #if defined(USE_AURA) || defined(OS_MACOSX)
     ImageTransportFactory::InitializeForUnitTests(
         std::unique_ptr<ImageTransportFactory>(
             new NoTransportImageTransportFactory));
 #endif
 #if defined(OS_ANDROID)
     ui::SetScreenAndroid();  // calls display::Screen::SetScreenInstance().
 #endif
 #if defined(USE_AURA)
     screen_.reset(aura::TestScreen::Create(gfx::Size()));
@@ skipping 167 matching lines @@
   std::unique_ptr<TestBrowserContext> browser_context_;
   RenderWidgetHostProcess* process_;  // Deleted automatically by the widget.
   std::unique_ptr<MockRenderWidgetHostDelegate> delegate_;
   std::unique_ptr<MockRenderWidgetHost> host_;
   std::unique_ptr<TestView> view_;
   std::unique_ptr<display::Screen> screen_;
   bool handle_key_press_event_;
   bool handle_mouse_event_;
   double last_simulated_event_time_seconds_;
   double simulated_event_time_delta_seconds_;
+  IPC::TestSink* sink_;
 
  private:
   SyntheticWebTouchEvent touch_event_;
 
   TestBrowserThreadBundle thread_bundle_;
   base::test::ScopedFeatureList feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostTest);
 };
 
@@ skipping 570 matching lines @@
                                             base::UnguessableToken::Create());
 
   host_->set_new_content_rendering_delay_for_testing(
       base::TimeDelta::FromMicroseconds(10));
 
   // Start the timer and immediately send a CompositorFrame with the
   // content_source_id of the new page. The timeout shouldn't fire.
   host_->StartNewContentRenderingTimeout(5);
   cc::CompositorFrame frame = MakeCompositorFrame(1.f, frame_size);
   frame.metadata.content_source_id = 5;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+  host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
       TimeDelta::FromMicroseconds(20));
   base::RunLoop().Run();
 
   EXPECT_FALSE(host_->new_content_rendering_timeout_fired());
   host_->reset_new_content_rendering_timeout_fired();
 
   // Start the timer but receive frames only from the old page. The timer
   // should fire.
   host_->StartNewContentRenderingTimeout(10);
   frame = MakeCompositorFrame(1.f, frame_size);
   frame.metadata.content_source_id = 9;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+  host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
       TimeDelta::FromMicroseconds(20));
   base::RunLoop().Run();
 
   EXPECT_TRUE(host_->new_content_rendering_timeout_fired());
   host_->reset_new_content_rendering_timeout_fired();
 
   // Send a CompositorFrame with content_source_id of the new page before we
   // attempt to start the timer. The timer shouldn't fire.
   frame = MakeCompositorFrame(1.f, frame_size);
   frame.metadata.content_source_id = 7;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+  host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
   host_->StartNewContentRenderingTimeout(7);
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
       TimeDelta::FromMicroseconds(20));
   base::RunLoop().Run();
 
   EXPECT_FALSE(host_->new_content_rendering_timeout_fired());
   host_->reset_new_content_rendering_timeout_fired();
 
   // Don't send any frames after the timer starts. The timer should fire.
@@ skipping 15 matching lines @@
 
   host_->StartNewContentRenderingTimeout(100);
   host_->set_new_content_rendering_delay_for_testing(
       base::TimeDelta::FromMicroseconds(9999));
 
   {
     // First swap a frame with an invalid ID.
     cc::CompositorFrame frame = MakeCompositorFrame(1.f, frame_size);
     frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true);
     frame.metadata.content_source_id = 99;
-    host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-        0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+    host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
     EXPECT_FALSE(
         static_cast<TestView*>(host_->GetView())->did_swap_compositor_frame());
     static_cast<TestView*>(host_->GetView())->reset_did_swap_compositor_frame();
   }
 
   {
     // Test with a valid content ID as a control.
     cc::CompositorFrame frame = MakeCompositorFrame(1.f, frame_size);
     frame.metadata.content_source_id = 100;
-    host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-        0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+    host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
     EXPECT_TRUE(
         static_cast<TestView*>(host_->GetView())->did_swap_compositor_frame());
     static_cast<TestView*>(host_->GetView())->reset_did_swap_compositor_frame();
   }
 
   {
     // We also accept frames with higher content IDs, to cover the case where
     // the browser process receives a compositor frame for a new page before
     // the corresponding DidCommitProvisionalLoad (it's a race).
     cc::CompositorFrame frame = MakeCompositorFrame(1.f, frame_size);
     frame.metadata.content_source_id = 101;
-    host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-        0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+    host_->SubmitCompositorFrame(local_surface_id, std::move(frame));
     EXPECT_TRUE(
         static_cast<TestView*>(host_->GetView())->did_swap_compositor_frame());
   }
 }
 
 TEST_F(RenderWidgetHostTest, TouchEmulator) {
   simulated_event_time_delta_seconds_ = 0.1;
   // Immediately ack all touches instead of sending them to the renderer.
   host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
   host_->SetTouchEventEmulationEnabled(
@@ skipping 483 matching lines @@
                                       blink::WebGestureDeviceTouchscreen,
                                       ui::LatencyInfo());
 
 
   // Tests RWHI::ForwardWheelEventWithLatencyInfo().
   SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
 
   ASSERT_FALSE(host_->input_router()->HasPendingEvents());
 }
 
+// Checks whether RWHI properly keeps track of the last compositor_frame_sink_id
+// and notifies the view_ when it changes.
+TEST_F(RenderWidgetHostTest, CompositorFrameSinkIdChanges) {
+  const gfx::Size frame_size(50, 50);
+  const cc::LocalSurfaceId local_surface_id(1,
+                                            base::UnguessableToken::Create());
+
+  // Ignore any IPC message sent so far.
+  sink_->ClearMessages();
+
+  // Submit a frame with compositor_frame_sink_id=1
+  cc::CompositorFrame frame = MakeCompositorFrame(1.f, frame_size);
+  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
+      0, 1, local_surface_id, frame, std::vector<IPC::Message>()));
+
+  // Send an ack. The right compositor_frame_sink_id must be sent.
+  host_->SendReclaimCompositorResources(true /* is_swap_ack */,
+                                        cc::ReturnedResourceArray());
+  ASSERT_EQ(1u, sink_->message_count());
+  {
+    const IPC::Message* msg = sink_->GetMessageAt(0);
+    EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID, msg->type());
+    ViewMsg_ReclaimCompositorResources::Param params;
+    ViewMsg_ReclaimCompositorResources::Read(msg, &params);
+    EXPECT_EQ(1u, std::get<0>(params));  // compositor_frame_sink_id
+  }
+  sink_->ClearMessages();
+
+  // Submit a frame with compositor_frame_sink_id=2. Verify that view_ is
+  // notified of the change in id.
+  view_->reset_did_change_compositor_frame_sink();
+  frame = MakeCompositorFrame(1.f, frame_size);
+  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
+      2, 2, local_surface_id, frame, std::vector<IPC::Message>()));
+  EXPECT_TRUE(view_->did_change_compositor_frame_sink());
+
+  // Send an ack. The right compositor_frame_sink_id must be sent.
+  host_->SendReclaimCompositorResources(true /* is_swap_ack */,
+                                        cc::ReturnedResourceArray());
+  ASSERT_EQ(1u, sink_->message_count());
+  {
+    const IPC::Message* msg = sink_->GetMessageAt(0);
+    EXPECT_EQ(ViewMsg_ReclaimCompositorResources::ID, msg->type());
+    ViewMsg_ReclaimCompositorResources::Param params;
+    ViewMsg_ReclaimCompositorResources::Read(msg, &params);
+    EXPECT_EQ(2u, std::get<0>(params));  // compositor_frame_sink_id
+  }
+  sink_->ClearMessages();
+}
+
 }  // namespace content