RendererCompositorFrameSink should handle local surface id allocation

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 205 matching lines @@
 
   bool new_content_rendering_timeout_fired_;
   WebInputEvent::Type acked_touch_event_type_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRenderWidgetHost);
 };
 
 namespace  {
 
+cc::CompositorFrame MakeCompositorFrame(float scale_factor, gfx::Size size) {
+  cc::CompositorFrame frame;
+  frame.metadata.device_scale_factor = scale_factor;
+  frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, 0, true);
+
+  std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
+  pass->SetNew(1, gfx::Rect(size), gfx::Rect(), gfx::Transform());
+  frame.render_pass_list.push_back(std::move(pass));
+  if (!size.IsEmpty()) {
+    cc::TransferableResource resource;
+    resource.id = 1;
+    frame.resource_list.push_back(std::move(resource));
+  }
+  return frame;
+}
+
 // RenderWidgetHostProcess -----------------------------------------------------
 
 class RenderWidgetHostProcess : public MockRenderProcessHost {
  public:
   explicit RenderWidgetHostProcess(BrowserContext* browser_context)
       : MockRenderProcessHost(browser_context) {
   }
   ~RenderWidgetHostProcess() override {}
 
   bool HasConnection() const override { return true; }
@@ skipping 1029 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
       TimeDelta::FromMicroseconds(20));
   base::RunLoop().Run();
   EXPECT_TRUE(host_->new_content_rendering_timeout_fired());
 }
 
 // This tests that a compositor frame received with a stale content source ID
 // in its metadata is properly discarded.
 TEST_F(RenderWidgetHostTest, SwapCompositorFrameWithBadSourceId) {
+  const gfx::Size frame_size(50, 50);
+  const cc::LocalSurfaceId local_surface_id(1,
+                                            base::UnguessableToken::Create());
+
   host_->StartNewContentRenderingTimeout(100);
   host_->OnFirstPaintAfterLoad();
 
-  // First swap a frame with an invalid ID.
-  cc::CompositorFrame frame;
-  frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, 0, true);
-  frame.metadata.content_source_id = 99;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, frame, std::vector<IPC::Message>()));
-  EXPECT_FALSE(
-      static_cast<TestView*>(host_->GetView())->did_swap_compositor_frame());
-  static_cast<TestView*>(host_->GetView())->reset_did_swap_compositor_frame();
+  {
+    // 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, 0, true);
+    frame.metadata.content_source_id = 99;
+    host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
+        0, 0, local_surface_id, frame, std::vector<IPC::Message>()));
+    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.
-  frame.metadata.content_source_id = 100;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, frame, std::vector<IPC::Message>()));
-  EXPECT_TRUE(
-      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>()));
+    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).
-  frame.metadata.content_source_id = 101;
-  host_->OnMessageReceived(ViewHostMsg_SwapCompositorFrame(
-      0, 0, frame, std::vector<IPC::Message>()));
-  EXPECT_TRUE(
-      static_cast<TestView*>(host_->GetView())->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>()));
+    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(
       true, ui::GestureProviderConfigType::GENERIC_MOBILE);
   process_->sink().ClearMessages();
   view_->set_bounds(gfx::Rect(0, 0, 400, 200));
@@ skipping 481 matching lines @@
                                       ui::LatencyInfo());
 
 
   // Tests RWHI::ForwardWheelEventWithLatencyInfo().
   SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
 
   ASSERT_FALSE(host_->input_router()->HasPendingEvents());
 }
 
 }  // namespace content