| Index: services/ui/ws/server_window_compositor_frame_sink_manager.cc
|
| diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.cc b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
|
| index b89eb1940b467eac29ab2a550d701a795aa3b60c..9240e16592c3a67c46aec34c17523d3b7999e71f 100644
|
| --- a/services/ui/ws/server_window_compositor_frame_sink_manager.cc
|
| +++ b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
|
| @@ -38,19 +38,20 @@ bool ServerWindowCompositorFrameSinkManager::ShouldDraw() {
|
| void ServerWindowCompositorFrameSinkManager::CreateDisplayCompositorFrameSink(
|
| gfx::AcceleratedWidget widget,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
| - cc::mojom::MojoCompositorFrameSinkClientPtr client) {
|
| - CreateCompositorFrameSinkInternal(mojom::CompositorFrameSinkType::DEFAULT,
|
| - widget, std::move(request),
|
| - std::move(client));
|
| + cc::mojom::MojoCompositorFrameSinkClientPtr client,
|
| + cc::mojom::DisplayPrivateRequest display_private_request) {
|
| + CreateCompositorFrameSinkInternal(
|
| + mojom::CompositorFrameSinkType::DEFAULT, widget, std::move(request),
|
| + std::move(client), std::move(display_private_request));
|
| }
|
|
|
| void ServerWindowCompositorFrameSinkManager::CreateOffscreenCompositorFrameSink(
|
| mojom::CompositorFrameSinkType compositor_frame_sink_type,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
| cc::mojom::MojoCompositorFrameSinkClientPtr client) {
|
| - CreateCompositorFrameSinkInternal(compositor_frame_sink_type,
|
| - gfx::kNullAcceleratedWidget,
|
| - std::move(request), std::move(client));
|
| + CreateCompositorFrameSinkInternal(
|
| + compositor_frame_sink_type, gfx::kNullAcceleratedWidget,
|
| + std::move(request), std::move(client), nullptr);
|
| }
|
|
|
| void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId(
|
| @@ -132,7 +133,8 @@ void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSinkInternal(
|
| mojom::CompositorFrameSinkType compositor_frame_sink_type,
|
| gfx::AcceleratedWidget widget,
|
| cc::mojom::MojoCompositorFrameSinkRequest request,
|
| - cc::mojom::MojoCompositorFrameSinkClientPtr client) {
|
| + cc::mojom::MojoCompositorFrameSinkClientPtr client,
|
| + cc::mojom::DisplayPrivateRequest display_private_request) {
|
| cc::FrameSinkId frame_sink_id(
|
| WindowIdToTransportId(window_->id()),
|
| static_cast<uint32_t>(compositor_frame_sink_type));
|
| @@ -153,7 +155,8 @@ void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSinkInternal(
|
| ->GetDisplayCompositor()
|
| ->CreateDisplayCompositorFrameSink(
|
| frame_sink_id, widget, std::move(request),
|
| - std::move(private_request), std::move(client));
|
| + std::move(private_request), std::move(client),
|
| + std::move(display_private_request));
|
| } else {
|
| window_->delegate()
|
| ->GetDisplayCompositor()
|
|
|