| Index: services/ui/public/cpp/window_compositor_frame_sink.cc
|
| diff --git a/services/ui/public/cpp/window_compositor_frame_sink.cc b/services/ui/public/cpp/window_compositor_frame_sink.cc
|
| index 36e1dea6efacdd631c7346f6af29d50525cdf52f..9cd9e2803cb281bb461a750d0ff96b4b31191722 100644
|
| --- a/services/ui/public/cpp/window_compositor_frame_sink.cc
|
| +++ b/services/ui/public/cpp/window_compositor_frame_sink.cc
|
| @@ -15,6 +15,7 @@ namespace ui {
|
| // static
|
| std::unique_ptr<WindowCompositorFrameSink> WindowCompositorFrameSink::Create(
|
| scoped_refptr<cc::ContextProvider> context_provider,
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| std::unique_ptr<WindowCompositorFrameSinkBinding>*
|
| compositor_frame_sink_binding) {
|
| cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink;
|
| @@ -27,7 +28,8 @@ std::unique_ptr<WindowCompositorFrameSink> WindowCompositorFrameSink::Create(
|
| GetProxy(&compositor_frame_sink),
|
| compositor_frame_sink_client.PassInterface()));
|
| return base::WrapUnique(new WindowCompositorFrameSink(
|
| - std::move(context_provider), compositor_frame_sink.PassInterface(),
|
| + std::move(context_provider), gpu_memory_buffer_manager,
|
| + compositor_frame_sink.PassInterface(),
|
| std::move(compositor_frame_sink_client_request)));
|
| }
|
|
|
| @@ -72,10 +74,14 @@ void WindowCompositorFrameSink::SubmitCompositorFrame(
|
|
|
| WindowCompositorFrameSink::WindowCompositorFrameSink(
|
| scoped_refptr<cc::ContextProvider> context_provider,
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSink>
|
| compositor_frame_sink_info,
|
| cc::mojom::MojoCompositorFrameSinkClientRequest client_request)
|
| - : cc::CompositorFrameSink(std::move(context_provider), nullptr),
|
| + : cc::CompositorFrameSink(std::move(context_provider),
|
| + nullptr,
|
| + gpu_memory_buffer_manager,
|
| + nullptr),
|
| compositor_frame_sink_info_(std::move(compositor_frame_sink_info)),
|
| client_request_(std::move(client_request)) {}
|
|
|
|
|