| Index: content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
|
| diff --git a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
|
| index 48253882848cd056e5d58c4d4002ee755d76b9f0..6208564d22f07904be1b6373d6b806376538722c 100644
|
| --- a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
|
| +++ b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
|
| @@ -75,8 +75,8 @@ TEST_F(OffscreenCanvasSurfaceManagerTest,
|
| cc::LocalSurfaceId current_local_surface_id(
|
| surface_id_allocator.GenerateId());
|
|
|
| - auto surface_impl = base::WrapUnique(
|
| - new OffscreenCanvasSurfaceImpl(frame_sink_id, std::move(client)));
|
| + auto surface_impl = base::WrapUnique(new OffscreenCanvasSurfaceImpl(
|
| + cc::FrameSinkId(), frame_sink_id, std::move(client)));
|
| EXPECT_EQ(1, this->getNumSurfaceImplInstances());
|
| EXPECT_EQ(surface_impl.get(),
|
| OffscreenCanvasSurfaceManager::GetInstance()->GetSurfaceInstance(
|
| @@ -93,16 +93,17 @@ TEST_F(OffscreenCanvasSurfaceManagerTest,
|
| TEST_F(OffscreenCanvasSurfaceManagerTest,
|
| MultiHTMLCanvasElementTransferToOffscreen) {
|
| blink::mojom::OffscreenCanvasSurfaceClientPtr client_a;
|
| + cc::FrameSinkId dummy_parent_frame_sink_id(0, 0);
|
| cc::FrameSinkId frame_sink_id_a(3, 3);
|
| cc::SurfaceIdAllocator surface_id_allocator;
|
| - auto surface_impl_a = base::WrapUnique(
|
| - new OffscreenCanvasSurfaceImpl(frame_sink_id_a, std::move(client_a)));
|
| + auto surface_impl_a = base::WrapUnique(new OffscreenCanvasSurfaceImpl(
|
| + dummy_parent_frame_sink_id, frame_sink_id_a, std::move(client_a)));
|
|
|
| blink::mojom::OffscreenCanvasSurfaceClientPtr client_b;
|
| cc::FrameSinkId frame_sink_id_b(4, 4);
|
|
|
| - auto surface_impl_b = base::WrapUnique(
|
| - new OffscreenCanvasSurfaceImpl(frame_sink_id_b, std::move(client_b)));
|
| + auto surface_impl_b = base::WrapUnique(new OffscreenCanvasSurfaceImpl(
|
| + dummy_parent_frame_sink_id, frame_sink_id_b, std::move(client_b)));
|
|
|
| EXPECT_EQ(2, this->getNumSurfaceImplInstances());
|
| EXPECT_EQ(surface_impl_a.get(),
|
|
|