| Index: services/ui/surfaces/display_compositor.cc
|
| diff --git a/services/ui/surfaces/display_compositor.cc b/services/ui/surfaces/display_compositor.cc
|
| index 6c922fdde40d268ade043f6d4cc334a515bed69a..a06aeba2e91557dafefa6da0f717870b6d192048 100644
|
| --- a/services/ui/surfaces/display_compositor.cc
|
| +++ b/services/ui/surfaces/display_compositor.cc
|
| @@ -36,6 +36,7 @@ DisplayCompositor::DisplayCompositor(
|
| cc::mojom::DisplayCompositorRequest request,
|
| cc::mojom::DisplayCompositorClientPtr client)
|
| : manager_(cc::SurfaceManager::LifetimeType::REFERENCES),
|
| + framesink_manager_(),
|
| gpu_service_(std::move(gpu_service)),
|
| gpu_memory_buffer_manager_(std::move(gpu_memory_buffer_manager)),
|
| image_factory_(image_factory),
|
| @@ -88,8 +89,8 @@ void DisplayCompositor::CreateDisplayCompositorFrameSink(
|
|
|
| compositor_frame_sinks_[frame_sink_id] =
|
| base::MakeUnique<display_compositor::GpuDisplayCompositorFrameSink>(
|
| - this, &manager_, frame_sink_id, std::move(display),
|
| - std::move(begin_frame_source), std::move(request),
|
| + this, &manager_,&framesink_manager_, frame_sink_id,
|
| + std::move(display), std::move(begin_frame_source), std::move(request),
|
| std::move(private_request), std::move(client),
|
| std::move(display_private_request));
|
| }
|
| @@ -104,8 +105,8 @@ void DisplayCompositor::CreateOffscreenCompositorFrameSink(
|
|
|
| compositor_frame_sinks_[frame_sink_id] =
|
| base::MakeUnique<display_compositor::GpuOffscreenCompositorFrameSink>(
|
| - this, &manager_, frame_sink_id, std::move(request),
|
| - std::move(private_request), std::move(client));
|
| + this, &manager_,&framesink_manager_, frame_sink_id,
|
| + std::move(request), std::move(private_request), std::move(client));
|
| }
|
|
|
| std::unique_ptr<cc::Display> DisplayCompositor::CreateDisplay(
|
|
|